summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/2.7.3.txt
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2016-04-03 00:14:26 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-04 23:35:05 -0700
commit95c38fb0ed45d9eb529afeb704b840818ba3da4d (patch)
treebd1e2a04da9bacb9c4cc630ffb54a326f577397f /Documentation/RelNotes/2.7.3.txt
parentMerge branch 'mm/doc-hooks-linkgit-fix' into maint (diff)
downloadtgif-95c38fb0ed45d9eb529afeb704b840818ba3da4d.tar.xz
branch: fix shortening of non-remote symrefs
Commit aedcb7d (branch.c: use 'ref-filter' APIs, 2015-09-23) adjusted the symref-printing code to look like this: if (item->symref) { skip_prefix(item->symref, "refs/remotes/", &desc); strbuf_addf(&out, " -> %s", desc); } This has three bugs in it: 1. It always skips past "refs/remotes/", instead of skipping past the prefix associated with the branch we are showing (so commonly we see "refs/remotes/" for the refs/remotes/origin/HEAD symref, but the previous code would skip "refs/heads/" when showing a symref it found in refs/heads/. 2. If skip_prefix() does not match, it leaves "desc" untouched, and we show whatever happened to be in it (which is the refname from a call to skip_prefix() earlier in the function). 3. If we do match with skip_prefix(), we stomp on the "desc" variable, which is later passed to add_verbose_info(). We probably want to retain the original refname there (though it likely doesn't matter in practice, since after all, one points to the other). The fix to match the original code is fairly easy: record the prefix to strip based on item->kind, and use it here. However, since we already have a local variable named "prefix", let's give the two prefixes verbose names so we don't confuse them. Signed-off-by: Jeff King <peff@peff.net> Acked-by: Karthik Nayak <karthik.188@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes/2.7.3.txt')
0 files changed, 0 insertions, 0 deletions