From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 May 2018 05:04:08 +0000 (+0900)
Subject: Merge branch 'ma/create-pseudoref-with-null-old-oid'
X-Git-Tag: v2.18.0-rc0~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26597cb0cceb82b315c543f1cc02bbb72c537eaa;p=thirdparty%2Fgit.git

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
---

26597cb0cceb82b315c543f1cc02bbb72c537eaa