Set $HOME for selftests

diff --git a/describe.c b/describe.c
index cc95eb0f213cfc95bcfb2ecf2b5d890963fdb578..ab192f83ae27c5e0bf3f2a5f61684d0dc66deb32 100644 (file)
--- a/describe.c
+++ b/describe.c
@@ -8,13 +8,12 @@
 static const char describe_usage[] =
 "git-describe [--all] [--tags] [--abbrev=<n>] <committish>*";
 
-static int all = 0;    /* Default to annotated tags only */
-static int tags = 0;   /* But allow any tags if --tags is specified */
+static int all;        /* Default to annotated tags only */
+static int tags;       /* But allow any tags if --tags is specified */
 
-#define DEFAULT_ABBREV 8 /* maybe too many */
 static int abbrev = DEFAULT_ABBREV;
 
-static int names = 0, allocs = 0;
+static int names, allocs;
 static struct commit_name {
        const struct commit *commit;
        int prio; /* annotated tag = 2, tag = 1, head = 0 */
@@ -43,7 +42,7 @@ static void add_to_known_names(const char *path,
        struct commit_name *name = xmalloc(sizeof(struct commit_name) + len);
 
        name->commit = commit;
-       name->prio = prio; 
+       name->prio = prio;
        memcpy(name->path, path, len);
        idx = names;
        if (idx >= allocs) {
@@ -68,7 +67,7 @@ static int get_name(const char *path, const unsigned char *sha1)
         * Otherwise only annotated tags are used.
         */
        if (!strncmp(path, "refs/tags/", 10)) {
-               if (object->type == tag_type)
+               if (object->type == OBJ_TAG)
                        prio = 2;
                else
                        prio = 1;
@@ -98,12 +97,20 @@ static int compare_names(const void *_a, const void *_b)
        return (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;
 }
 
-static void describe(struct commit *cmit, int last_one)
+static void describe(const char *arg, int last_one)
 {
+       unsigned char sha1[20];
+       struct commit *cmit;
        struct commit_list *list;
        static int initialized = 0;
        struct commit_name *n;
 
+       if (get_sha1(arg, sha1))
+               die("Not a valid object name %s", arg);
+       cmit = lookup_commit_reference(sha1);
+       if (!cmit)
+               die("%s is not a valid '%s' object", arg, commit_type);
+
        if (!initialized) {
                initialized = 1;
                for_each_ref(get_name);
@@ -138,29 +145,31 @@ int main(int argc, char **argv)
 
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
-               unsigned char sha1[20];
-               struct commit *cmit;
 
-               if (!strcmp(arg, "--all")) {
+               if (*arg != '-')
+                       break;
+               else if (!strcmp(arg, "--all"))
                        all = 1;
-                       continue;
-               }
-               if (!strcmp(arg, "--tags")) {
+               else if (!strcmp(arg, "--tags"))
                        tags = 1;
-                       continue;
-               }
-               if (!strncmp(arg, "--abbrev=", 9)) {
+               else if (!strncmp(arg, "--abbrev=", 9)) {
                        abbrev = strtoul(arg + 9, NULL, 10);
-                       if (abbrev < 4 || 40 <= abbrev)
+                       if (abbrev < MINIMUM_ABBREV || 40 < abbrev)
                                abbrev = DEFAULT_ABBREV;
-                       continue;
                }
-               if (get_sha1(arg, sha1) < 0)
-                       usage(describe_usage);
-               cmit = lookup_commit_reference(sha1);
-               if (!cmit)
+               else
                        usage(describe_usage);
-               describe(cmit, i == argc - 1);
        }
+
+       setup_git_directory();
+
+       if (argc <= i)
+               describe("HEAD", 1);
+       else
+               while (i < argc) {
+                       describe(argv[i], (i == argc - 1));
+                       i++;
+               }
+
        return 0;
 }