summaryrefslogtreecommitdiff
path: root/builtin/merge-tree.c
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2013-04-27 13:40:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-04-28 18:53:41 (GMT)
commitab5f42422d7e025c3151d91cc5ec0d20b9a80922 (patch)
tree4d5b34b530add1399b22f5bce0bdc87fd78bb7fa /builtin/merge-tree.c
parentaacecc3b36a6cd4d2707e3f1cbd7bb4122477c64 (diff)
downloadgit-ab5f42422d7e025c3151d91cc5ec0d20b9a80922.zip
git-ab5f42422d7e025c3151d91cc5ec0d20b9a80922.tar.gz
git-ab5f42422d7e025c3151d91cc5ec0d20b9a80922.tar.bz2
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>
Diffstat (limited to 'builtin/merge-tree.c')
-rw-r--r--builtin/merge-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index ed25d81..ec49917 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -302,7 +302,7 @@ static void unresolved(const struct traverse_info *info, struct name_entry n[3])
static int threeway_callback(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *info)
{
/* Same in both? */
- if (same_entry(entry+1, entry+2) || both_empty(entry+0, entry+2)) {
+ if (same_entry(entry+1, entry+2) || both_empty(entry+1, entry+2)) {
/* Modified, added or removed identically */
resolve(info, NULL, entry+1);
return mask;