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

diff --git a/reflog-walk.h b/reflog-walk.h
index e63d86778bbba826c0943598e1130d31a87b4b77..7ca1438f4d74b652f962c6bdfddd08fe0d75802d 100644 (file)
--- a/reflog-walk.h
+++ b/reflog-walk.h
@@ -2,10 +2,10 @@
 #define REFLOG_WALK_H
 
 extern void init_reflog_walk(struct reflog_walk_info** info);
-extern void add_reflog_for_walk(struct reflog_walk_info *info,
+extern int add_reflog_for_walk(struct reflog_walk_info *info,
                struct commit *commit, const char *name);
 extern void fake_reflog_parent(struct reflog_walk_info *info,
                struct commit *commit);
-extern void show_reflog_message(struct reflog_walk_info *info, int);
+extern void show_reflog_message(struct reflog_walk_info *info, int, int);
 
 #endif