Prevent send-pack from segfaulting when a branch doesn't match

diff --git a/revision.h b/revision.h
index cdf94ad695a1a929ac094a9a42c868e75c1182a5..98a0a8f3fa9db4b2302dd31a4867ae824831b25c 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -81,6 +81,7 @@ struct rev_info {
        const char      *log_reencode;
        const char      *subject_prefix;
        int             no_inline;
+       int             show_log_size;
 
        /* Filter by commit log message */
        struct grep_opt *grep_filter;
@@ -106,14 +107,12 @@ struct rev_info {
 #define REV_TREE_DIFFERENT     2
 
 /* revision.c */
-extern int rev_same_tree_as_empty(struct rev_info *, struct tree *t1);
-extern int rev_compare_tree(struct rev_info *, struct tree *t1, struct tree *t2);
 
 extern void init_revisions(struct rev_info *revs, const char *prefix);
 extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);
 extern int handle_revision_arg(const char *arg, struct rev_info *revs,int flags,int cant_be_filename);
 
-extern void prepare_revision_walk(struct rev_info *revs);
+extern int prepare_revision_walk(struct rev_info *revs);
 extern struct commit *get_revision(struct rev_info *revs);
 
 extern void mark_parents_uninteresting(struct commit *commit);
@@ -131,6 +130,5 @@ extern void add_object(struct object *obj,
                       const char *name);
 
 extern void add_pending_object(struct rev_info *revs, struct object *obj, const char *name);
-extern void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode);
 
 #endif