[PATCH] remote.c: use shorten_unambiguous_ref
- From
Michael J Gruber <git@drmicha.warpmail.net>
- Date
- Apr 9, 2009, 15:33 UTC
- Message-ID
- <1239291182-12860-1-git-send-email-git@drmicha.warpmail.net>
Use the new shorten_unambiguous_ref() for simplifying the output of upstream branch names. This affects status and checkout.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> --- I intentionally didn't combine the line with the previous one (see context) to make things a bit clearer.
I haven't seen more obvious place for using shorten_unambiguous_ref(). prettify_ref() is a natural candidate but is mostly used for prettyfying refs on the remote side. git branch is covered by Jeff's patch already.
remote.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/remote.c b/remote.c index a06761a..10af722 100644 --- a/remote.c +++ b/remote.c @@ -1461,11 +1461,7 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb) return 0; base = branch->merge[0]->dst; - if (!prefixcmp(base, "refs/remotes/")) { - base += strlen("refs/remotes/"); - } else if (!prefixcmp(base, "refs/heads/")) { - base += strlen("refs/heads/"); - } + base = shorten_unambiguous_ref(base); if (!num_theirs) strbuf_addf(sb, "Your branch is ahead of '%s' " "by %d commit%s.\n",
-- 1.6.2.2.646.gb214