From: Jonathan Nieder Date: Thu, 02 Oct 2014 02:15:54 GMT Subject: [PATCH 16/24] branch -d: simplify by using RESOLVE_REF_READING flag Message-ID: <20141002021554.GI1175@google.com> In-Reply-To: <20141002014817.GS1175@google.com> From: Ronnie Sahlberg Date: Thu, 11 Sep 2014 10:34:36 -0700 When "git branch -d" reads the branch it is about to delete, it used to avoid passing the RESOLVE_REF_READING ('treat missing ref as error') flag because a symref pointing to a nonexistent ref would show up as missing instead of as something that could be deleted. To check if a ref is actually missing, we then check - is it a symref? - if not, did it resolve to null_sha1? Now we pass RESOLVE_REF_NO_RECURSE and the correct information is returned for a symref even when it points to a missing ref. Simplify by relying on RESOLVE_REF_READING. No functional change intended. Signed-off-by: Jonathan Nieder --- Split out from the 'fix handling of badly named refs' patch. builtin/branch.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/builtin/branch.c b/builtin/branch.c index a334380..a0c5601 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -234,10 +234,11 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, free(name); name = mkpathdup(fmt, bname.buf); - target = resolve_ref_unsafe(name, RESOLVE_REF_NO_RECURSE, + target = resolve_ref_unsafe(name, + RESOLVE_REF_READING + | RESOLVE_REF_NO_RECURSE, sha1, &flags); - if (!target || - (!(flags & REF_ISSYMREF) && is_null_sha1(sha1))) { + if (!target) { error(remote_branch ? _("remote branch '%s' not found.") : _("branch '%s' not found."), bname.buf); -- 2.1.0.rc2.206.gedb03e5