difftool: make --gui, --tool and --extcmd mutually exclusive

diff --git a/sha1-name.c b/sha1-name.c
index fbcd2f78eb3fafc84748063d46e14f5153ffe4bc..faa60f69e311f5f09cd5b91a8fbbaf3e3e744ab0 100644 (file)
--- a/sha1-name.c
+++ b/sha1-name.c
@@ -46,7 +46,7 @@ static void update_candidates(struct disambiguate_state *ds, const struct object
                oidcpy(&ds->candidate, current);
                ds->candidate_exists = 1;
                return;
-       } else if (!oidcmp(&ds->candidate, current)) {
+       } else if (oideq(&ds->candidate, current)) {
                /* the same as what we already have seen */
                return;
        }