summaryrefslogtreecommitdiff
path: root/t/t4135/diff-with backslash.diff
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2011-09-17 21:57:45 +1000
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-09-18 14:11:40 -0700
commitbaf18fc261ca475343fe3cb9cd2c0dded4bc1bb7 (patch)
tree666474a67f25d9906b2eace5692d1613beab21a6 /t/t4135/diff-with backslash.diff
parentmerge: remove global variable head[] (diff)
downloadtgif-baf18fc261ca475343fe3cb9cd2c0dded4bc1bb7.tar.xz
Accept tags in HEAD or MERGE_HEAD
HEAD and MERGE_HEAD (among other branch tips) should never hold a tag. That can only be caused by broken tools and is cumbersome to fix by an end user with: $ git update-ref HEAD $(git rev-parse HEAD^{commit}) which may look like a magic to a new person. Be easy, warn users (so broken tools can be fixed if they bother to report) and move on. Be robust, if the given SHA-1 cannot be resolved to a commit object, die (therefore return value is always valid). Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4135/diff-with backslash.diff')
0 files changed, 0 insertions, 0 deletions