Merge branch 'rs/path-name-safety-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Mar 2017 20:07:36 +0000 (13:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Mar 2017 20:07:36 +0000 (13:07 -0700)
Code clean-up.

* rs/path-name-safety-cleanup:
revision: remove declaration of path_name()

1  2 
revision.h
diff --combined revision.h
index 9fac1a607de6470ab0c9b7e5079e8d36c8d68c75,01d2d3e33de4ecd8baa808ef2f5553a4a29f0127..14886ec92b4f67527a86fc821998214a4d2b321f
@@@ -135,7 -135,6 +135,7 @@@ struct rev_info 
                        pretty_given:1,
                        abbrev_commit:1,
                        abbrev_commit_given:1,
 +                      zero_commit:1,
                        use_terminator:1,
                        missing_newline:1,
                        date_mode_explicit:1,
                        track_first_time:1,
                        linear:1;
  
 -      enum date_mode date_mode;
 +      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;
@@@ -259,8 -256,6 +259,6 @@@ extern void put_revision_mark(const str
  extern void mark_parents_uninteresting(struct commit *commit);
  extern void mark_tree_uninteresting(struct tree *tree);
  
- char *path_name(struct strbuf *path, const char *name);
  extern void show_object_with_name(FILE *, struct object *, const char *);
  
  extern void add_pending_object(struct rev_info *revs,