From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Dec 2013 19:47:18 +0000 (-0800)
Subject: Merge branch 'jl/commit-v-strip-marker'
X-Git-Tag: v1.9-rc0~61
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/14a9c5f261bcc436b80700076257f02af0beec68

Merge branch 'jl/commit-v-strip-marker'

"git commit -v" appends the patch to the log message before
editing, and then removes the patch when the editor returned
control. However, the patch was not stripped correctly when the
first modified path was a submodule.

* jl/commit-v-strip-marker:
commit -v: strip diffs and submodule shortlogs from the commit message
---

14a9c5f261bcc436b80700076257f02af0beec68
diff --cc wt-status.c
index 4625cdb900,85390b813f..cd7d706a63
--- a/wt-status.c
+++ b/wt-status.c
@@@ -15,8 -15,10 +15,11 @@@
  #include "submodule.h"
  #include "column.h"
  #include "strbuf.h"
 +#include "utf8.h"
  
+ static char cut_line[] =
+ "------------------------ >8 ------------------------\n";
+ 
  static char default_wt_status_colors[][COLOR_MAXLEN] = {
  	GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
  	GIT_COLOR_GREEN,  /* WT_STATUS_UPDATED */