From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Sep 2017 06:24:07 +0000 (+0900)
Subject: Merge branch 'ks/commit-do-not-touch-cut-line'
X-Git-Tag: v2.15.0-rc0~64
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/77f45395b01ad27534f751a74233c77912d80758?ds=inline;hp=-c

Merge branch 'ks/commit-do-not-touch-cut-line'

The explanation of the cut-line in the commit log editor has been
slightly tweaked.

* ks/commit-do-not-touch-cut-line:
commit-template: change a message to be more intuitive
---

77f45395b01ad27534f751a74233c77912d80758
diff --combined wt-status.c
index ac972acbab,23e87e74dc..6f730ee8f2
--- a/wt-status.c
+++ b/wt-status.c
@@@ -934,7 -934,7 +934,7 @@@ size_t wt_status_locate_end(const char 
  
  void wt_status_add_cut_line(FILE *fp)
  {
- 	const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
+ 	const char *explanation = _("Do not modify or remove the line above.\nEverything below it will be ignored.");
  	struct strbuf buf = STRBUF_INIT;
  
  	fprintf(fp, "%c %s", comment_line_char, cut_line);
@@@ -1026,7 -1026,6 +1026,7 @@@ static void wt_longstatus_print_trackin
  				 comment_line_char);
  	else
  		fputs("\n", s->fp);
 +	strbuf_release(&sb);
  }
  
  static int has_unmerged(struct wt_status *s)
@@@ -1194,7 -1193,6 +1194,7 @@@ static int read_rebase_todolist(const c
  		string_list_append(lines, line.buf);
  	}
  	fclose(f);
 +	strbuf_release(&line);
  	return 0;
  }