summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-18 21:11:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-18 22:16:23 (GMT)
commit118aa4acff6afae733c206df7049ea54f7e0b282 (patch)
tree61d76c896c087f7b182ac118b0ecc66c935b9940 /builtin/merge-file.c
parent45bc950b4330ab675724b5079aa1528acde9f404 (diff)
downloadgit-118aa4acff6afae733c206df7049ea54f7e0b282.zip
git-118aa4acff6afae733c206df7049ea54f7e0b282.tar.gz
git-118aa4acff6afae733c206df7049ea54f7e0b282.tar.bz2
name-rev: differentiate between tags and commits they point at
"git name-rev --stdin" has been fixed to convert an object name that points at a tag to a refname of the tag. The codepath to handle its command line arguments, however, fed the commit that the tag points at to the underlying naming machinery. With this fix, you will get this: $ git name-rev --refs=tags/\* --name-only $(git rev-parse v1.8.3 v1.8.3^0) v1.8.3 v1.8.3^0 which is the same as what you would get from the fixed "--stdin" variant: $ git rev-parse v1.8.3 v1.8.3^0 | git name-rev --refs=tags/\* --name-only v1.8.3 v1.8.3^0 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions