From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Mar 2017 20:52:27 +0000 (-0700)
Subject: Merge branch 'rs/path-name-safety-cleanup' into maint
X-Git-Tag: v2.12.3~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1c91ec0b8ea750584b4657b9a38413e02b3956ad?hp=-c

Merge branch 'rs/path-name-safety-cleanup' into maint

Code clean-up.

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

1c91ec0b8ea750584b4657b9a38413e02b3956ad
diff --combined revision.h
index 9fac1a607d,01d2d3e33d..14886ec92b
--- a/revision.h
+++ b/revision.h
@@@ -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,
@@@ -147,9 -146,7 +147,9 @@@
  			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,