cherry-pick, revert: add a label for ancestor

jrn · gitster · commit bf975d379d79 · 2010-03-20T20:36:11.000-07:00
When writing conflict hunks in ‘diff3 -m’ format, also add a label to
the common ancestor.  Especially in a cherry-pick, it is not immediately
obvious without such a label what the common ancestor represents.

git rerere does not have trouble parsing the new output and its preimage
ids are unchanged since it includes its own code for recreating conflict
hunks.  No other code in git parses conflict hunks.

Requested-by: Stefan Monnier &lt;monnier@iro.umontreal.ca&gt;
Signed-off-by: Jonathan Nieder &lt;jrnieder@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/revert.c b/builtin/revert.c
@@ -281,7 +281,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
 {
 	unsigned char head[20];
 	struct commit *base, *next, *parent;
-	const char *next_label;
+	const char *base_label, *next_label;
 	int i, index_fd, clean;
 	struct commit_message msg = { NULL, NULL, NULL, NULL, NULL };
 
@@ -368,6 +368,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
 
 	if (action == REVERT) {
 		base = commit;
+		base_label = msg.label;
 		next = parent;
 		next_label = msg.parent_label;
 		add_to_msg("Revert \"");
@@ -382,6 +383,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
 		add_to_msg(".\n");
 	} else {
 		base = parent;
+		base_label = msg.parent_label;
 		next = commit;
 		next_label = msg.label;
 		set_author_ident_env(msg.message);
@@ -395,6 +397,7 @@ static int revert_or_cherry_pick(int argc, const char **argv)
 
 	read_cache();
 	init_merge_options(&o);
+	o.ancestor = base ? base_label : "(empty tree)";
 	o.branch1 = "HEAD";
 	o.branch2 = next ? next_label : "(empty tree)";
 
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
@@ -112,7 +112,7 @@ test_expect_success 'diff3 -m style' '
 	cat <<-EOF > expected &&
 	<<<<<<< HEAD
 	a
-	|||||||
+	||||||| parent of objid picked
 	b
 	=======
 	c
@@ -179,7 +179,7 @@ test_expect_success 'revert conflict, diff3 -m style' '
 	cat <<-EOF > expected &&
 	<<<<<<< HEAD
 	a
-	|||||||
+	||||||| objid picked
 	c
 	=======
 	b

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ test_expect_success 'diff3 -m style' '`
`112`	`112`	`cat <<-EOF > expected &&`
`113`	`113`	`<<<<<<< HEAD`
`114`	`114`	`a`
`115`		`- \|\|\|\|\|\|\|`
	`115`	`+ \|\|\|\|\|\|\| parent of objid picked`
`116`	`116`	`b`
`117`	`117`	`=======`
`118`	`118`	`c`
`@@ -179,7 +179,7 @@ test_expect_success 'revert conflict, diff3 -m style' '`
`179`	`179`	`cat <<-EOF > expected &&`
`180`	`180`	`<<<<<<< HEAD`
`181`	`181`	`a`
`182`		`- \|\|\|\|\|\|\|`
	`182`	`+ \|\|\|\|\|\|\| objid picked`
`183`	`183`	`c`
`184`	`184`	`=======`
`185`	`185`	`b`