diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-05-30 14:04:08 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 14:04:08 +0900 |
commit | 26597cb0cceb82b315c543f1cc02bbb72c537eaa (patch) | |
tree | 99051d4931818a123a6123bbcb6cfe6f512d6586 /commit.c | |
parent | cf315793c1ef90788470438a7ef8dc281ea97806 (diff) | |
parent | db0210d445963e5d85f98e48d6a93b971779d449 (diff) |
Merge branch 'ma/create-pseudoref-with-null-old-oid'
"git update-ref A B" is supposed to ensure that ref A does not yet
exist when B is a NULL OID, but this check was not done correctly
for pseudo-refs outside refs/ hierarchy, e.g. MERGE_HEAD.
* ma/create-pseudoref-with-null-old-oid:
refs: handle zero oid for pseudorefs
t1400: add tests around adding/deleting pseudorefs
refs.c: refer to "object ID", not "sha1", in error messages
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions