git-commit: allow --only to lose what was staged earlier.

diff --git a/builtin-branch.c b/builtin-branch.c
index 22e3285a4ccf42f1f5a679eb209925bb03419d0f..3d5cb0e4b2de8abf3a9f1af8fadb9c1bc5393967 100644 (file)
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -11,7 +11,7 @@
 #include "builtin.h"
 
 static const char builtin_branch_usage[] =
-"git-branch (-d | -D) <branchname> | [-l] [-f] <branchname> [<start-point>] | [-r] | [-a]";
+"git-branch (-d | -D) <branchname> | [-l] [-f] <branchname> [<start-point>] | [-r | -a] [-v] [--abbrev=<length>] ";
 
 
 static const char *head;
@@ -38,12 +38,16 @@ static int in_merge_bases(const unsigned char *sha1,
 
 static void delete_branches(int argc, const char **argv, int force)
 {
-       struct commit *rev, *head_rev;
+       struct commit *rev, *head_rev = head_rev;
        unsigned char sha1[20];
        char *name;
        int i;
 
-       head_rev = lookup_commit_reference(head_sha1);
+       if (!force) {
+               head_rev = lookup_commit_reference(head_sha1);
+               if (!head_rev)
+                       die("Couldn't look up commit object for HEAD");
+       }
        for (i = 0; i < argc; i++) {
                if (!strcmp(head, argv[i]))
                        die("Cannot delete the branch you are currently on.");
@@ -53,8 +57,8 @@ static void delete_branches(int argc, const char **argv, int force)
                        die("Branch '%s' not found.", argv[i]);
 
                rev = lookup_commit_reference(sha1);
-               if (!rev || !head_rev)
-                       die("Couldn't look up commit objects.");
+               if (!rev)
+                       die("Couldn't look up commit object for '%s'", name);
 
                /* This checks whether the merge bases of branch and
                 * HEAD contains branch -- which means that the HEAD
@@ -87,10 +91,11 @@ static void delete_branches(int argc, const char **argv, int force)
 struct ref_item {
        char *name;
        unsigned int kind;
+       unsigned char sha1[20];
 };
 
 struct ref_list {
-       int index, alloc;
+       int index, alloc, maxwidth;
        struct ref_item *list;
        int kinds;
 };
@@ -100,6 +105,7 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,
        struct ref_list *ref_list = (struct ref_list*)(cb_data);
        struct ref_item *newitem;
        int kind = REF_UNKNOWN_TYPE;
+       int len;
 
        /* Detect kind */
        if (!strncmp(refname, "refs/heads/", 11)) {
@@ -128,6 +134,10 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,
        newitem = &(ref_list->list[ref_list->index++]);
        newitem->name = xstrdup(refname);
        newitem->kind = kind;
+       hashcpy(newitem->sha1, sha1);
+       len = strlen(newitem->name);
+       if (len > ref_list->maxwidth)
+               ref_list->maxwidth = len;
 
        return 0;
 }
@@ -151,7 +161,24 @@ static int ref_cmp(const void *r1, const void *r2)
        return strcmp(c1->name, c2->name);
 }
 
-static void print_ref_list(int kinds)
+static void print_ref_info(const unsigned char *sha1, int abbrev)
+{
+       struct commit *commit;
+       char subject[256];
+
+
+       commit = lookup_commit(sha1);
+       if (commit && !parse_commit(commit))
+               pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0,
+                                   subject, sizeof(subject), 0,
+                                   NULL, NULL, 0);
+       else
+               strcpy(subject, " **** invalid ref ****");
+
+       printf(" %s %s\n", find_unique_abbrev(sha1, abbrev), subject);
+}
+
+static void print_ref_list(int kinds, int verbose, int abbrev)
 {
        int i;
        char c;
@@ -169,7 +196,13 @@ static void print_ref_list(int kinds)
                                !strcmp(ref_list.list[i].name, head))
                        c = '*';
 
-               printf("%c %s\n", c, ref_list.list[i].name);
+               if (verbose) {
+                       printf("%c %-*s", c, ref_list.maxwidth,
+                              ref_list.list[i].name);
+                       print_ref_info(ref_list.list[i].sha1, abbrev);
+               }
+               else
+                       printf("%c %s\n", c, ref_list.list[i].name);
        }
 
        free_ref_list(&ref_list);
@@ -215,6 +248,7 @@ static void create_branch(const char *name, const char *start,
 int cmd_branch(int argc, const char **argv, const char *prefix)
 {
        int delete = 0, force_delete = 0, force_create = 0;
+       int verbose = 0, abbrev = DEFAULT_ABBREV;
        int reflog = 0;
        int kinds = REF_LOCAL_BRANCH;
        int i;
@@ -255,6 +289,14 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
                        reflog = 1;
                        continue;
                }
+               if (!strncmp(arg, "--abbrev=", 9)) {
+                       abbrev = atoi(arg+9);
+                       continue;
+               }
+               if (!strcmp(arg, "-v")) {
+                       verbose = 1;
+                       continue;
+               }
                usage(builtin_branch_usage);
        }
 
@@ -268,7 +310,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
        if (delete)
                delete_branches(argc - i, argv + i, force_delete);
        else if (i == argc)
-               print_ref_list(kinds);
+               print_ref_list(kinds, verbose, abbrev);
        else if (i == argc - 1)
                create_branch(argv[i], head, force_create, reflog);
        else if (i == argc - 2)