diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-18 04:42:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-18 04:42:12 (GMT) |
| commit | a9b772a0116869f0f93e57ca0b49fd66325bb04a (patch) | |
| tree | 21ff148b24d3a0239d5a68a647a6884569a4a5d2 /builtin-branch.c | |
| parent | bd15ef078afac3f0f147e815d3b85d6d2a48dd1a (diff) | |
| parent | 45972ffbedf8175555434006595c71a5b0e643f1 (diff) | |
| download | git-a9b772a0116869f0f93e57ca0b49fd66325bb04a.zip git-a9b772a0116869f0f93e57ca0b49fd66325bb04a.tar.gz git-a9b772a0116869f0f93e57ca0b49fd66325bb04a.tar.bz2 | |
Merge branch 'bw/short-ref-strict'
* bw/short-ref-strict:
remote.c: use shorten_unambiguous_ref
rev-parse: --abbrev-ref option to shorten ref name
for-each-ref: utilize core.warnAmbiguousRefs for :short-format
shorten_unambiguous_ref(): add strict mode
Diffstat (limited to 'builtin-branch.c')
| -rw-r--r-- | builtin-branch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-branch.c b/builtin-branch.c index 3275821..91098ca 100644 --- a/builtin-branch.c +++ b/builtin-branch.c @@ -311,14 +311,14 @@ static void fill_tracking_info(struct strbuf *stat, const char *branch_name, if (branch && branch->merge && branch->merge[0]->dst && show_upstream_ref) strbuf_addf(stat, "[%s] ", - shorten_unambiguous_ref(branch->merge[0]->dst)); + shorten_unambiguous_ref(branch->merge[0]->dst, 0)); return; } strbuf_addch(stat, '['); if (show_upstream_ref) strbuf_addf(stat, "%s: ", - shorten_unambiguous_ref(branch->merge[0]->dst)); + shorten_unambiguous_ref(branch->merge[0]->dst, 0)); if (!ours) strbuf_addf(stat, "behind %d] ", theirs); else if (!theirs) |