New config push.default to decide default behavior for push

[git.git] / builtin-branch.c

diff --git a/builtin-branch.c b/builtin-branch.c
index 7607f6ab9c612ef49b792f38a334374e11374e9c..14d4b917e5bb929f40efd3fc5e010cec5d3507de 100644 (file)
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -32,18 +32,18 @@ static unsigned char head_sha1[20];
 
 static int branch_use_color = -1;
 static char branch_colors[][COLOR_MAXLEN] = {
-       "\033[m",       /* reset */
-       "",             /* PLAIN (normal) */
-       "\033[31m",     /* REMOTE (red) */
-       "",             /* LOCAL (normal) */
-       "\033[32m",     /* CURRENT (green) */
+       GIT_COLOR_RESET,
+       GIT_COLOR_NORMAL,       /* PLAIN */
+       GIT_COLOR_RED,          /* REMOTE */
+       GIT_COLOR_NORMAL,       /* LOCAL */
+       GIT_COLOR_GREEN,        /* CURRENT */
 };
 enum color_branch {
-       COLOR_BRANCH_RESET = 0,
-       COLOR_BRANCH_PLAIN = 1,
-       COLOR_BRANCH_REMOTE = 2,
-       COLOR_BRANCH_LOCAL = 3,
-       COLOR_BRANCH_CURRENT = 4,
+       BRANCH_COLOR_RESET = 0,
+       BRANCH_COLOR_PLAIN = 1,
+       BRANCH_COLOR_REMOTE = 2,
+       BRANCH_COLOR_LOCAL = 3,
+       BRANCH_COLOR_CURRENT = 4,
 };
 
 static enum merge_filter {
@@ -56,15 +56,15 @@ static unsigned char merge_filter_ref[20];
 static int parse_branch_color_slot(const char *var, int ofs)
 {
        if (!strcasecmp(var+ofs, "plain"))
-               return COLOR_BRANCH_PLAIN;
+               return BRANCH_COLOR_PLAIN;
        if (!strcasecmp(var+ofs, "reset"))
-               return COLOR_BRANCH_RESET;
+               return BRANCH_COLOR_RESET;
        if (!strcasecmp(var+ofs, "remote"))
-               return COLOR_BRANCH_REMOTE;
+               return BRANCH_COLOR_REMOTE;
        if (!strcasecmp(var+ofs, "local"))
-               return COLOR_BRANCH_LOCAL;
+               return BRANCH_COLOR_LOCAL;
        if (!strcasecmp(var+ofs, "current"))
-               return COLOR_BRANCH_CURRENT;
+               return BRANCH_COLOR_CURRENT;
        die("bad config variable '%s'", var);
 }
 
@@ -99,6 +99,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds)
        const char *fmt, *remote;
        int i;
        int ret = 0;
+       struct strbuf bname = STRBUF_INIT;
 
        switch (kinds) {
        case REF_REMOTE_BRANCH:
@@ -119,20 +120,25 @@ static int delete_branches(int argc, const char **argv, int force, int kinds)
                if (!head_rev)
                        die("Couldn't look up commit object for HEAD");
        }
-       for (i = 0; i < argc; i++) {
-               if (kinds == REF_LOCAL_BRANCH && !strcmp(head, argv[i])) {
+       for (i = 0; i < argc; i++, strbuf_release(&bname)) {
+               int len = strlen(argv[i]);
+
+               if (interpret_nth_last_branch(argv[i], &bname) != len)
+                       strbuf_add(&bname, argv[i], len);
+
+               if (kinds == REF_LOCAL_BRANCH && !strcmp(head, bname.buf)) {
                        error("Cannot delete the branch '%s' "
-                               "which you are currently on.", argv[i]);
+                             "which you are currently on.", bname.buf);
                        ret = 1;
                        continue;
                }
 
                free(name);
 
-               name = xstrdup(mkpath(fmt, argv[i]));
+               name = xstrdup(mkpath(fmt, bname.buf));
                if (!resolve_ref(name, sha1, 1, NULL)) {
                        error("%sbranch '%s' not found.",
-                                       remote, argv[i]);
+                                       remote, bname.buf);
                        ret = 1;
                        continue;
                }
@@ -152,22 +158,23 @@ static int delete_branches(int argc, const char **argv, int force, int kinds)
                if (!force &&
                    !in_merge_bases(rev, &head_rev, 1)) {
                        error("The branch '%s' is not an ancestor of "
-                               "your current HEAD.\n"
-                               "If you are sure you want to delete it, "
-                               "run 'git branch -D %s'.", argv[i], argv[i]);
+                             "your current HEAD.\n"
+                             "If you are sure you want to delete it, "
+                             "run 'git branch -D %s'.", bname.buf, bname.buf);
                        ret = 1;
                        continue;
                }
 
                if (delete_ref(name, sha1, 0)) {
                        error("Error deleting %sbranch '%s'", remote,
-                              argv[i]);
+                             bname.buf);
                        ret = 1;
                } else {
                        struct strbuf buf = STRBUF_INIT;
-                       printf("Deleted %sbranch %s (%s).\n", remote, argv[i],
-                               find_unique_abbrev(sha1, DEFAULT_ABBREV));
-                       strbuf_addf(&buf, "branch.%s", argv[i]);
+                       printf("Deleted %sbranch %s (%s).\n", remote,
+                              bname.buf,
+                              find_unique_abbrev(sha1, DEFAULT_ABBREV));
+                       strbuf_addf(&buf, "branch.%s", bname.buf);
                        if (git_config_rename_section(buf.buf, NULL) < 0)
                                warning("Update of config-file failed");
                        strbuf_release(&buf);
@@ -337,30 +344,30 @@ static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
 
        switch (item->kind) {
        case REF_LOCAL_BRANCH:
-               color = COLOR_BRANCH_LOCAL;
+               color = BRANCH_COLOR_LOCAL;
                break;
        case REF_REMOTE_BRANCH:
-               color = COLOR_BRANCH_REMOTE;
+               color = BRANCH_COLOR_REMOTE;
                break;
        default:
-               color = COLOR_BRANCH_PLAIN;
+               color = BRANCH_COLOR_PLAIN;
                break;
        }
 
        c = ' ';
        if (current) {
                c = '*';
-               color = COLOR_BRANCH_CURRENT;
+               color = BRANCH_COLOR_CURRENT;
        }
 
        strbuf_addf(&name, "%s%s", prefix, item->name);
        if (verbose)
                strbuf_addf(&out, "%c %s%-*s%s", c, branch_get_color(color),
                            maxwidth, name.buf,
-                           branch_get_color(COLOR_BRANCH_RESET));
+                           branch_get_color(BRANCH_COLOR_RESET));
        else
                strbuf_addf(&out, "%c %s%s%s", c, branch_get_color(color),
-                           name.buf, branch_get_color(COLOR_BRANCH_RESET));
+                           name.buf, branch_get_color(BRANCH_COLOR_RESET));
 
        if (item->dest)
                strbuf_addf(&out, " -> %s", item->dest);
@@ -432,10 +439,12 @@ static void print_ref_list(int kinds, int detached, int verbose, int abbrev, str
            is_descendant_of(head_commit, with_commit)) {
                struct ref_item item;
                item.name = xstrdup("(no branch)");
+               item.len = strlen(item.name);
                item.kind = REF_LOCAL_BRANCH;
+               item.dest = NULL;
                item.commit = head_commit;
-               if (strlen(item.name) > ref_list.maxwidth)
-                       ref_list.maxwidth = strlen(item.name);
+               if (item.len > ref_list.maxwidth)
+                       ref_list.maxwidth = item.len;
                print_ref_item(&item, ref_list.maxwidth, verbose, abbrev, 1, "");
                free(item.name);
        }