diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-28 21:15:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-28 21:15:33 -0700 |
| commit | 1b76df16d1e0f819af4e4766f7f621568571fd9f (patch) | |
| tree | 69c3c1dc794b7b13c0a0b6f1036afbb62774a36b | |
| parent | a452d148d10a89ae502bc4755c191ab323227ce5 (diff) | |
| parent | b792c067872a6b4ec6545dc4375a7084626cb0fa (diff) | |
| download | git-1b76df16d1e0f819af4e4766f7f621568571fd9f.tar.gz | |
Merge branch 'nk/branch-v-abbrev'
* nk/branch-v-abbrev:
branch -v: honor core.abbrev
| -rw-r--r-- | Documentation/git-branch.txt | 3 | ||||
| -rw-r--r-- | builtin/branch.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index c50f189827..507b8d0ab2 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -113,7 +113,8 @@ OPTIONS --abbrev=<length>:: Alter the sha1's minimum display length in the output listing. - The default value is 7. + The default value is 7 and can be overridden by the `core.abbrev` + config option. --no-abbrev:: Display the full sha1s in the output listing rather than abbreviating them. diff --git a/builtin/branch.c b/builtin/branch.c index 3142daa57a..953bc1ca9b 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -613,7 +613,7 @@ static int opt_parse_merge_filter(const struct option *opt, const char *arg, int int cmd_branch(int argc, const char **argv, const char *prefix) { int delete = 0, rename = 0, force_create = 0; - int verbose = 0, abbrev = DEFAULT_ABBREV, detached = 0; + int verbose = 0, abbrev = -1, detached = 0; int reflog = 0; enum branch_track track; int kinds = REF_LOCAL_BRANCH; @@ -696,6 +696,9 @@ int cmd_branch(int argc, const char **argv, const char *prefix) if (!!delete + !!rename + !!force_create > 1) usage_with_options(builtin_branch_usage, options); + if (abbrev == -1) + abbrev = DEFAULT_ABBREV; + if (delete) return delete_branches(argc, argv, delete > 1, kinds); else if (argc == 0) |