git-fetch: exit with non-zero status when fast-forward check fails

diff --git a/builtin-show-ref.c b/builtin-show-ref.c
index 12c457c3c1acb888d4b3442d11db0f8b414c2d82..06ec400d7f3f2e589111a561a6b18da067a02f1f 100644 (file)
--- a/builtin-show-ref.c
+++ b/builtin-show-ref.c
@@ -3,15 +3,16 @@
 #include "object.h"
 #include "tag.h"
 
-static const char show_ref_usage[] = "git show-ref [-q|--quiet] [--verify] [-h|--head] [-d|--dereference] [-s|--hash] [--tags] [--heads] [--] [pattern*]";
+static const char show_ref_usage[] = "git show-ref [-q|--quiet] [--verify] [-h|--head] [-d|--dereference] [-s|--hash[=<length>]] [--abbrev[=<length>]] [--tags] [--heads] [--] [pattern*]";
 
 static int deref_tags = 0, show_head = 0, tags_only = 0, heads_only = 0,
-       found_match = 0, verify = 0, quiet = 0, hash_only = 0;
+       found_match = 0, verify = 0, quiet = 0, hash_only = 0, abbrev = 0;
 static const char **pattern;
 
 static int show_ref(const char *refname, const unsigned char *sha1, int flag, void *cbdata)
 {
        struct object *obj;
+       const char *hex;
 
        if (tags_only || heads_only) {
                int match;
@@ -51,13 +52,16 @@ static int show_ref(const char *refname, const unsigned char *sha1, int flag, vo
        }
        if (quiet)
                return 0;
+
+       hex = find_unique_abbrev(sha1, abbrev);
        if (hash_only)
-               printf("%s\n", sha1_to_hex(sha1));
+               printf("%s\n", hex);
        else
-               printf("%s %s\n", sha1_to_hex(sha1), refname);
+               printf("%s %s\n", hex, refname);
        if (deref_tags && obj->type == OBJ_TAG) {
                obj = deref_tag(obj, refname, 0);
-               printf("%s %s^{}\n", sha1_to_hex(obj->sha1), refname);
+               hex = find_unique_abbrev(obj->sha1, abbrev);
+               printf("%s %s^{}\n", hex, refname);
        }
        return 0;
 }
@@ -94,6 +98,29 @@ int cmd_show_ref(int argc, const char **argv, const char *prefix)
                        hash_only = 1;
                        continue;
                }
+               if (!strncmp(arg, "--hash=", 7) ||
+                   (!strncmp(arg, "--abbrev", 8) &&
+                    (arg[8] == '=' || arg[8] == '\0'))) {
+                       if (arg[3] != 'h' && !arg[8])
+                               /* --abbrev only */
+                               abbrev = DEFAULT_ABBREV;
+                       else {
+                               /* --hash= or --abbrev= */
+                               char *end;
+                               if (arg[3] == 'h') {
+                                       hash_only = 1;
+                                       arg += 7;
+                               }
+                               else
+                                       arg += 9;
+                               abbrev = strtoul(arg, &end, 10);
+                               if (*end || abbrev > 40)
+                                       usage(show_ref_usage);
+                               if (abbrev < MINIMUM_ABBREV)
+                                       abbrev = MINIMUM_ABBREV;
+                       }
+                       continue;
+               }
                if (!strcmp(arg, "--verify")) {
                        verify = 1;
                        continue;