Merge branch 'jc/commit-s-subject-is-not-a-footer'

gitster · gitster · commit 6e31f3dbb59c · 2009-11-06T23:17:47.000-08:00
* jc/commit-s-subject-is-not-a-footer:
  builtin-commit.c: fix logic to omit empty line before existing footers
diff --git a/builtin-commit.c b/builtin-commit.c
@@ -530,7 +530,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 		for (i = sb.len - 1; i > 0 && sb.buf[i - 1] != '\n'; i--)
 			; /* do nothing */
 		if (prefixcmp(sb.buf + i, sob.buf)) {
-			if (!ends_rfc2822_footer(&sb))
+			if (!i || !ends_rfc2822_footer(&sb))
 				strbuf_addch(&sb, '\n');
 			strbuf_addbuf(&sb, &sob);
 		}
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
@@ -258,4 +258,13 @@ test_expect_success 'Hand committing of a redundant merge removes dups' '
 
 '
 
+test_expect_success 'A single-liner subject with a token plus colon is not a footer' '
+
+	git reset --hard &&
+	git commit -s -m "hello: kitty" --allow-empty &&
+	git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
+	test $(wc -l <actual) = 3
+
+'
+
 test_done

Original file line number	Diff line number	Diff line change
`@@ -530,7 +530,7 @@ static int prepare_to_commit(const char index_file, const char prefix,`
`530`	`530`	`for (i = sb.len - 1; i > 0 && sb.buf[i - 1] != '\n'; i--)`
`531`	`531`	`; /* do nothing */`
`532`	`532`	`if (prefixcmp(sb.buf + i, sob.buf)) {`
`533`		`- if (!ends_rfc2822_footer(&sb))`
	`533`	`+ if (!i \|\| !ends_rfc2822_footer(&sb))`
`534`	`534`	`strbuf_addch(&sb, '\n');`
`535`	`535`	`strbuf_addbuf(&sb, &sob);`
`536`	`536`	`}`