push: propagate remote and refspec with --recurse-submodules

diff --git a/revision.h b/revision.h
index 40797535fa71d15dca7602cc850cc46218c6df1f..14886ec92b4f67527a86fc821998214a4d2b321f 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -133,7 +133,6 @@ struct rev_info {
                        show_notes_given:1,
                        show_signature:1,
                        pretty_given:1,
-                       expand_tabs_in_log:1,
                        abbrev_commit:1,
                        abbrev_commit_given:1,
                        zero_commit:1,
@@ -149,6 +148,8 @@ struct rev_info {
                        linear:1;
 
        struct date_mode date_mode;
+       int             expand_tabs_in_log; /* unset if negative */
+       int             expand_tabs_in_log_default;
 
        unsigned int    abbrev;
        enum cmit_fmt   commit_format;
@@ -258,16 +259,7 @@ extern void put_revision_mark(const struct rev_info *revs,
 extern void mark_parents_uninteresting(struct commit *commit);
 extern void mark_tree_uninteresting(struct tree *tree);
 
-struct name_path {
-       struct name_path *up;
-       int elem_len;
-       const char *elem;
-};
-
-char *path_name(const struct name_path *path, const char *name);
-
-extern void show_object_with_name(FILE *, struct object *,
-                                 const struct name_path *, const char *);
+extern void show_object_with_name(FILE *, struct object *, const char *);
 
 extern void add_pending_object(struct rev_info *revs,
                               struct object *obj, const char *name);