merge-tree: fix typo in "both changed identically"
Commit aacecc3 (merge-tree: don't print entries that match "local" - 2013-04-07) had a typo causing the "same in both" check to be incorrect and check if both the base and "their" versions are removed instead of checking that both the "our" and "their" versions are removed. Fix this. Reported-by: René Scharfe <rene.scharfe@lsrfire.ath.cx> Test-written-by: René Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
John Keeping committed
Apr 27, 2013 at 14:40 UTC
ab5f42422d7e025c3151d91cc5ec0d20b9a80922
2 files changed
+14
-1
builtin/merge-tree.c
+1
-1
@@ -302,7 +302,7 @@ static void unresolved(const struct traverse_info *info, struct name_entry n[3])
302
static int threeway_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *info)
303
{
304
/* Same in both? */
305
- if (same_entry(entry+1, entry+2) || both_empty(entry+0, entry+2)) {
305
+ if (same_entry(entry+1, entry+2) || both_empty(entry+1, entry+2)) {
306
/* Modified, added or removed identically */
307
resolve(info, NULL, entry+1);
308
return mask;
t/t4300-merge-tree.sh
+13
@@ -205,6 +205,19 @@ EXPECTED
205
test_cmp expected actual
206
'
207
208
+test_expect_success 'file remove A, B (same)' '
209
+ cat >expected <<\EXPECTED &&
210
+EXPECTED
211
+
212
+ git reset --hard initial &&
213
+ test_commit "rm-a-b-base" "ONE" "AAA" &&
214
+ git rm ONE &&
215
+ git commit -m "rm-a-b" &&
216
+ git tag "rm-a-b" &&
217
+ git merge-tree rm-a-b-base rm-a-b rm-a-b >actual &&
218
+ test_cmp expected actual
219
+'
220
+
221
test_expect_success 'file change A, remove B' '
222
cat >expected <<\EXPECTED &&
223
removed in remote