subtree: make --ignore-joins pay attention to adds

diff --git a/sha1-name.c b/sha1-name.c
index 6cccfbbfbff396fb17ac9f3f357dcead802ecf94..faa60f69e311f5f09cd5b91a8fbbaf3e3e744ab0 100644 (file)
--- a/sha1-name.c
+++ b/sha1-name.c
@@ -13,6 +13,7 @@
 #include "object-store.h"
 #include "repository.h"
 #include "midx.h"
+#include "commit-reach.h"
 
 static int get_oid_oneline(const char *, struct object_id *, struct commit_list *);
 
@@ -45,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;
        }