summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-28 20:04:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-28 21:04:28 (GMT)
commit261f315bebfa9af2d09f20211960100ff06f87cb (patch)
tree398928f70a310b7e06d33025a5126e6403fad74a /builtin
parent073bd75e177aa9f1fc42b152a38e251c7156dfe0 (diff)
downloadgit-261f315bebfa9af2d09f20211960100ff06f87cb.zip
git-261f315bebfa9af2d09f20211960100ff06f87cb.tar.gz
git-261f315bebfa9af2d09f20211960100ff06f87cb.tar.bz2
merge & sequencer: turn "Conflicts:" hint into a comment
Just like other hints such as "Changes to be committed" we show in the editor to remind the committer what paths were involved in the resulting commit to help improving their log message, this section is merely a reminder. Traditionally, it was not made into comments primarily because it has to be generated outside the wt-status infrastructure, and also because it was meant as a bit stronger reminder than the others (i.e. explaining how you resolved conflicts is much more important than mentioning what you did to every paths involved in the commit). But that still does not make this hint a part of the log message proper, and not showing it as a comment is inviting mistakes. Note that we still notice "Conflicts:" followed by list of indented pathnames as an old-style cruft and insert a new Signed-off-by: before it. This is so that "commit --amend -s" adds the new S-o-b at the right place when used on an older commit. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/commit.c47
1 files changed, 31 insertions, 16 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index cd455aa..0a78e76 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -596,32 +596,47 @@ static char *cut_ident_timestamp_part(char *string)
/*
* Inspect sb and determine the true "end" of the log message, in
* order to find where to put a new Signed-off-by: line. Ignored are
- * trailing "Conflict:" block.
+ * trailing comment lines and blank lines, and also the traditional
+ * "Conflicts:" block that is not commented out, so that we can use
+ * "git commit -s --amend" on an existing commit that forgot to remove
+ * it.
*
* Returns the number of bytes from the tail to ignore, to be fed as
* the second parameter to append_signoff().
*/
static int ignore_non_trailer(struct strbuf *sb)
{
- int ignore_footer = 0;
- int i, eol, previous = 0;
- const char *nl;
+ int boc = 0;
+ int bol = 0;
+ int in_old_conflicts_block = 0;
- for (i = 0; i < sb->len; i++) {
- nl = memchr(sb->buf + i, '\n', sb->len - i);
- if (nl)
- eol = nl - sb->buf;
+ while (bol < sb->len) {
+ char *next_line;
+
+ if (!(next_line = memchr(sb->buf + bol, '\n', sb->len - bol)))
+ next_line = sb->buf + sb->len;
else
- eol = sb->len;
- if (!prefixcmp(sb->buf + previous, "\nConflicts:\n")) {
- ignore_footer = sb->len - previous;
- break;
+ next_line++;
+
+ if (sb->buf[bol] == comment_line_char || sb->buf[bol] == '\n') {
+ /* is this the first of the run of comments? */
+ if (!boc)
+ boc = bol;
+ /* otherwise, it is just continuing */
+ } else if (!prefixcmp(sb->buf + bol, "Conflicts:\n")) {
+ in_old_conflicts_block = 1;
+ if (!boc)
+ boc = bol;
+ } else if (in_old_conflicts_block && sb->buf[bol] == '\t') {
+ ; /* a pathname in the conflicts block */
+ } else if (boc) {
+ /* the previous was not trailing comment */
+ boc = 0;
+ in_old_conflicts_block = 0;
}
- while (i < eol)
- i++;
- previous = eol;
+ bol = next_line - sb->buf;
}
- return ignore_footer;
+ return boc ? sb->len - boc : 0;
}
static int prepare_to_commit(const char *index_file, const char *prefix,