Merge branch 'nd/maint-refname-in-hierarchy-check'

* nd/maint-refname-in-hierarchy-check: Fix incorrect ref namespace check
2012-01-29 13:18:51 -08:00
parent 77cdf0f802 97ba642bcf
commit 02a20d1038
3 changed files with 4 additions and 4 deletions
--- a/builtin/remote.c
+++ b/builtin/remote.c
@ -534,7 +534,7 @@ static int add_branch_for_removal(const char *refname,
 	}

 	/* don't delete non-remote-tracking refs */
-	if (prefixcmp(refname, "refs/remotes")) {
+	if (prefixcmp(refname, "refs/remotes/")) {
 		/* advise user how to delete local branches */
 		if (!prefixcmp(refname, "refs/heads/"))
 			string_list_append(branches->skipped,