summaryrefslogtreecommitdiff
path: root/t/t7605-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Michael Dressel <MichaelTiloDressel@t-online.de>2008-06-04 21:06:31 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-06-04 13:08:03 -0700
commit4ed19a3c178d22fbd424af78b42b65533a8d1ebb (patch)
treea190332ce9ec7b4e6a614a6335a2cae255faa3e5 /t/t7605-merge-resolve.sh
parentGIT 1.5.5.3 (diff)
downloadtgif-4ed19a3c178d22fbd424af78b42b65533a8d1ebb.tar.xz
describe: match pattern for lightweight tags too
The <pattern> given "git describe --match" was used only to filter tag objects, and not to filter lightweight tags. This fixes it. [jc: made the log to clarify this is a bugfix, not an enhancement, with additional test] Signed-off-by: Michael Dressel <MichaelTiloDressel@t-online.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7605-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions