contrib/completion: add smerge to the mergetool completion candidates

diff --git a/send-pack.c b/send-pack.c
index 7b9829f165e7aff7abe804fb780cf7c9d88aaf73..6dc16c3211631402432207dcf99b1ef4e87f012b 100644 (file)
--- a/send-pack.c
+++ b/send-pack.c
@@ -40,7 +40,7 @@ int option_parse_push_signed(const struct option *opt,
 
 static void feed_object(const struct object_id *oid, FILE *fh, int negative)
 {
-       if (negative && !has_sha1_file(oid->hash))
+       if (negative && !has_object_file(oid))
                return;
 
        if (negative)