git-revert: Revert revert message to old behaviour

diff --git a/builtin-fetch--tool.c b/builtin-fetch--tool.c
index 3090ffea205c625a05c02d78e94ab60ce0b765c7..e9d676455078b40138ad4716a912c4b2b5e10c2e 100644 (file)
--- a/builtin-fetch--tool.c
+++ b/builtin-fetch--tool.c
@@ -2,9 +2,31 @@
 #include "refs.h"
 #include "commit.h"
 
-static void show_new(char *type, unsigned char *sha1_new)
+#define CHUNK_SIZE 1024
+
+static char *get_stdin(void)
+{
+       int offset = 0;
+       char *data = xmalloc(CHUNK_SIZE);
+
+       while (1) {
+               int cnt = xread(0, data + offset, CHUNK_SIZE);
+               if (cnt < 0)
+                       die("error reading standard input: %s",
+                           strerror(errno));
+               if (cnt == 0) {
+                       data[offset] = 0;
+                       break;
+               }
+               offset += cnt;
+               data = xrealloc(data, offset + CHUNK_SIZE);
+       }
+       return data;
+}
+
+static void show_new(enum object_type type, unsigned char *sha1_new)
 {
-       fprintf(stderr, "  %s: %s\n", type,
+       fprintf(stderr, "  %s: %s\n", typename(type),
                find_unique_abbrev(sha1_new, DEFAULT_ABBREV));
 }
 
@@ -36,14 +58,16 @@ static int update_local_ref(const char *name,
                            const char *note,
                            int verbose, int force)
 {
-       char type[20];
        unsigned char sha1_old[20], sha1_new[20];
        char oldh[41], newh[41];
        struct commit *current, *updated;
+       enum object_type type;
 
        if (get_sha1_hex(new_head, sha1_new))
                die("malformed object name %s", new_head);
-       if (sha1_object_info(sha1_new, type, NULL))
+
+       type = sha1_object_info(sha1_new, NULL);
+       if (type < 0)
                die("object %s not found", new_head);
 
        if (!*name) {
@@ -157,16 +181,18 @@ static int append_fetch_head(FILE *fp,
        remote_len = i + 1;
        if (4 < i && !strncmp(".git", remote + i - 3, 4))
                remote_len = i - 3;
-       note_len = sprintf(note, "%s\t%s\t",
-                          sha1_to_hex(commit ? commit->object.sha1 : sha1),
-                          not_for_merge ? "not-for-merge" : "");
+
+       note_len = 0;
        if (*what) {
                if (*kind)
                        note_len += sprintf(note + note_len, "%s ", kind);
                note_len += sprintf(note + note_len, "'%s' of ", what);
        }
        note_len += sprintf(note + note_len, "%.*s", remote_len, remote);
-       fprintf(fp, "%s\n", note);
+       fprintf(fp, "%s\t%s\t%s\n",
+               sha1_to_hex(commit ? commit->object.sha1 : sha1),
+               not_for_merge ? "not-for-merge" : "",
+               note);
        return update_local_ref(local_name, head, note, verbose, force);
 }
 
@@ -383,6 +409,8 @@ static int expand_refs_wildcard(const char *ls_remote_result, int numrefs,
                        eol = !next ? (ls + strlen(ls)) : next;
                        if (!memcmp("^{}", eol-3, 3))
                                continue;
+                       if (eol - ls < 40)
+                               continue;
                        if (get_sha1_hex(ls, sha1))
                                continue;
                        ls += 40;
@@ -442,12 +470,6 @@ int cmd_fetch__tool(int argc, const char **argv, const char *prefix)
                fclose(fp);
                return result;
        }
-       if (!strcmp("update-local-ref", argv[1])) {
-               if (argc != 5)
-                       return error("update-local-ref takes 3 args");
-               return update_local_ref(argv[2], argv[3], argv[4],
-                                       verbose, force);
-       }
        if (!strcmp("native-store", argv[1])) {
                int result;
                FILE *fp;
@@ -461,14 +483,22 @@ int cmd_fetch__tool(int argc, const char **argv, const char *prefix)
                return result;
        }
        if (!strcmp("parse-reflist", argv[1])) {
+               const char *reflist;
                if (argc != 3)
                        return error("parse-reflist takes 1 arg");
-               return parse_reflist(argv[2]);
+               reflist = argv[2];
+               if (!strcmp(reflist, "-"))
+                       reflist = get_stdin();
+               return parse_reflist(reflist);
        }
        if (!strcmp("expand-refs-wildcard", argv[1])) {
+               const char *reflist;
                if (argc < 4)
                        return error("expand-refs-wildcard takes at least 2 args");
-               return expand_refs_wildcard(argv[2], argc - 3, argv + 3);
+               reflist = argv[2];
+               if (!strcmp(reflist, "-"))
+                       reflist = get_stdin();
+               return expand_refs_wildcard(reflist, argc - 3, argv + 3);
        }
 
        return error("Unknown subcommand: %s", argv[1]);