git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'

diff --git a/revision.h b/revision.h
index 992e1e9dd57eac528c3ecaf09987593d525da611..c8b3b948ecc1cc8b45859a6e1ea11763addfb8b5 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -33,6 +33,7 @@ struct rev_info {
                        prune:1,
                        no_merges:1,
                        no_walk:1,
+                       show_all:1,
                        remove_empty_trees:1,
                        simplify_history:1,
                        lifo:1,
@@ -74,7 +75,7 @@ struct rev_info {
        struct log_info *loginfo;
        int             nr, total;
        const char      *mime_boundary;
-       const char      *message_id;
+       char            *message_id;
        const char      *ref_message_id;
        const char      *add_signoff;
        const char      *extra_headers;
@@ -130,6 +131,8 @@ extern void add_object(struct object *obj,
 
 extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
 
+extern void add_head_to_pending(struct rev_info *);
+
 enum commit_action {
        commit_ignore,
        commit_show,