summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2015-06-22 16:02:56 +0200
committerJunio C Hamano <gitster@pobox.com>2015-06-22 13:17:09 -0700
commit5d97861b9baf3b0596f2a1c343634062aec2df84 (patch)
tree741272e2763e7b925516ba2088485e6e7f94803a
parent98ffd5ff67d1097280e3c16accde6de86d3ece3d (diff)
downloadgit-5d97861b9baf3b0596f2a1c343634062aec2df84.tar.gz
delete_refs(): make error message more generic
Change the error message from Could not remove branch %s to could not remove reference %s First of all, the old error message referred to "branch refs/remotes/origin/foo", which was awkward even for the existing caller. Normally we would refer to a reference like that as either "remote-tracking branch origin/foo" or "reference refs/remotes/origin/foo". Here I take the lazier alternative. Moreover, now that this function is part of the refs API, it might be called for refs that are neither branches nor remote-tracking branches. While we're at it, convert the error message to lower case, as per our usual convention. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--refs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/refs.c b/refs.c
index 72e51a9675..cebabc5cd4 100644
--- a/refs.c
+++ b/refs.c
@@ -2843,7 +2843,7 @@ int delete_refs(struct string_list *refnames)
const char *refname = refnames->items[i].string;
if (delete_ref(refname, NULL, 0))
- result |= error(_("Could not remove branch %s"), refname);
+ result |= error(_("could not remove reference %s"), refname);
}
return result;