diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-09-17 21:57:45 +1000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-09-18 14:11:40 -0700 |
| commit | baf18fc261ca475343fe3cb9cd2c0dded4bc1bb7 (patch) | |
| tree | 666474a67f25d9906b2eace5692d1613beab21a6 /t/t4037-diff-r-t-dirs.sh | |
| parent | merge: remove global variable head[] (diff) | |
| download | tgif-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/t4037-diff-r-t-dirs.sh')
0 files changed, 0 insertions, 0 deletions