branch -d: simplify by using RESOLVE_REF_READING
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: Ronnie Sahlberg <sahlberg@google.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ronnie Sahlberg committed
Sep 11, 2014 at 10:34 UTC
18f29fc61ed88145a0664657c3cea9e9732ea5e8
1 file changed
+4
-3
builtin/branch.c
+4
-3
@@ -236,10 +236,11 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
236
free(name);
237
238
name = mkpathdup(fmt, bname.buf);
239
- target = resolve_ref_unsafe(name, RESOLVE_REF_NO_RECURSE,
239
+ target = resolve_ref_unsafe(name,
240
+ RESOLVE_REF_READING
241
+ | RESOLVE_REF_NO_RECURSE,
242
sha1, &flags);
241
- if (!target ||
242
- (!(flags & REF_ISSYMREF) && is_null_sha1(sha1))) {
243
+ if (!target) {
244
error(remote_branch
245
? _("remote branch '%s' not found.")
246
: _("branch '%s' not found."), bname.buf);