From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Dec 2014 20:28:22 +0000 (-0800)
Subject: Merge branch 'rs/use-strbuf-complete-line'
X-Git-Tag: v2.3.0-rc0~37
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a305b15f82984bd000351e5ab4720a4a170e42b0?ds=inline;hp=-c

Merge branch 'rs/use-strbuf-complete-line'

* rs/use-strbuf-complete-line:
use strbuf_complete_line() for adding a newline if needed
---

a305b15f82984bd000351e5ab4720a4a170e42b0
diff --combined builtin/fmt-merge-msg.c
index 37177c6c29,b5c1ac2bcb..af7919e51e
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@@ -216,8 -216,7 +216,7 @@@ static void add_branch_desc(struct strb
  			strbuf_addf(out, "  : %.*s", (int)(ep - bp), bp);
  			bp = ep;
  		}
- 		if (out->buf[out->len - 1] != '\n')
- 			strbuf_addch(out, '\n');
+ 		strbuf_complete_line(out);
  	}
  	strbuf_release(&desc);
  }
@@@ -602,7 -601,7 +601,7 @@@ int fmt_merge_msg(struct strbuf *in, st
  
  	/* get current branch */
  	current_branch = current_branch_to_free =
 -		resolve_refdup("HEAD", head_sha1, 1, NULL);
 +		resolve_refdup("HEAD", RESOLVE_REF_READING, head_sha1, NULL);
  	if (!current_branch)
  		die("No current branch");
  	if (starts_with(current_branch, "refs/heads/"))
diff --combined trace.c
index 4778608941,7149651601..f6f9f3a367
--- a/trace.c
+++ b/trace.c
@@@ -122,9 -122,7 +122,7 @@@ static int prepare_trace_line(const cha
  
  static void print_trace_line(struct trace_key *key, struct strbuf *buf)
  {
- 	/* append newline if missing */
- 	if (buf->len && buf->buf[buf->len - 1] != '\n')
- 		strbuf_addch(buf, '\n');
+ 	strbuf_complete_line(buf);
  
  	write_or_whine_pipe(get_trace_fd(key), buf->buf, buf->len, err_msg);
  	strbuf_release(buf);
@@@ -216,7 -214,7 +214,7 @@@ void trace_argv_printf(const char **arg
  	va_end(ap);
  }
  
 -void trace_strbuf(const char *key, const struct strbuf *data)
 +void trace_strbuf(struct trace_key *key, const struct strbuf *data)
  {
  	trace_strbuf_fl(NULL, 0, key, data);
  }
@@@ -298,12 -296,13 +296,12 @@@ void trace_repo_setup(const char *prefi
  {
  	static struct trace_key key = TRACE_KEY_INIT(SETUP);
  	const char *git_work_tree;
 -	char cwd[PATH_MAX];
 +	char *cwd;
  
  	if (!trace_want(&key))
  		return;
  
 -	if (!getcwd(cwd, PATH_MAX))
 -		die("Unable to get current working directory");
 +	cwd = xgetcwd();
  
  	if (!(git_work_tree = get_git_work_tree()))
  		git_work_tree = "(null)";
@@@ -315,8 -314,6 +313,8 @@@
  	trace_printf_key(&key, "setup: worktree: %s\n", quote_crnl(git_work_tree));
  	trace_printf_key(&key, "setup: cwd: %s\n", quote_crnl(cwd));
  	trace_printf_key(&key, "setup: prefix: %s\n", quote_crnl(prefix));
 +
 +	free(cwd);
  }
  
  int trace_want(struct trace_key *key)
@@@ -385,7 -382,7 +383,7 @@@ static inline uint64_t gettimeofday_nan
   * Returns nanoseconds since the epoch (01/01/1970), for performance tracing
   * (i.e. favoring high precision over wall clock time accuracy).
   */
 -inline uint64_t getnanotime(void)
 +uint64_t getnanotime(void)
  {
  	static uint64_t offset;
  	if (offset > 1) {