Thread (1 message) 1 message, 1 author, 2019-06-04

Re: [PATCH v2] merge-recursive: restore accidentally dropped setting of path

From: Junio C Hamano <hidden>
Date: 2019-06-04 21:34:01

SZEDER Gábor [off-list ref] writes:
quoted
+		test_must_fail git merge-file \
+			-L "HEAD" \
+			-L "" \
+			-L "A^0" \
+			ours empty theirs &&
+		git hash-object b >actual &&
+		git hash-object ours >expect &&
+		test_cmp ours b
Here, however, you only changed what test_cmp looks at, but still kept
the two 'git hash-object' invocations, and their output will never be
looked at.
Thanks for quickly responding to a problem report and coming up with
a solution with further polishing, all.

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help