From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Sep 2012 21:37:46 +0000 (-0700)
Subject: Merge branch 'jc/make-static'
X-Git-Tag: v1.8.0-rc0~35
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=06e211acc61c52a2e1709ea8b62a0b0f6dcb492b;p=git.git

Merge branch 'jc/make-static'

Turn many file-scope private symbols to static to reduce the
global namespace contamination.

* jc/make-static:
  sequencer.c: mark a private file-scope symbol as static
  ident.c: mark private file-scope symbols as static
  trace.c: mark a private file-scope symbol as static
  wt-status.c: mark a private file-scope symbol as static
  read-cache.c: mark a private file-scope symbol as static
  strbuf.c: mark a private file-scope symbol as static
  sha1-array.c: mark a private file-scope symbol as static
  symlinks.c: mark private file-scope symbols as static
  notes.c: mark a private file-scope symbol as static
  rerere.c: mark private file-scope symbols as static
  graph.c: mark private file-scope symbols as static
  diff.c: mark a private file-scope symbol as static
  commit.c: mark a file-scope private symbol as static
  builtin/notes.c: mark file-scope private symbols as static
---

06e211acc61c52a2e1709ea8b62a0b0f6dcb492b
diff --cc sequencer.c
index dbef5cea0,ce8a59f57..e3723d209
--- a/sequencer.c
+++ b/sequencer.c
@@@ -17,9 -17,7 +17,9 @@@
  
  #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
  
 +const char sign_off_header[] = "Signed-off-by: ";
 +
- void remove_sequencer_state(void)
+ static void remove_sequencer_state(void)
  {
  	struct strbuf seq_dir = STRBUF_INIT;
  
diff --cc sequencer.h
index 60287b8da,99eb7fa09..9d57d5752
--- a/sequencer.h
+++ b/sequencer.h
@@@ -44,13 -44,6 +44,10 @@@ struct replay_opts 
  	struct rev_info *revs;
  };
  
- /* Removes SEQ_DIR. */
- extern void remove_sequencer_state(void);
- 
  int sequencer_pick_revisions(struct replay_opts *opts);
  
 +extern const char sign_off_header[];
 +
 +void append_signoff(struct strbuf *msgbuf, int ignore_footer);
 +
  #endif