summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-20 13:12:13 -0700
committerJunio C Hamano <gitster@pobox.com>2014-06-20 13:12:14 -0700
commitfa8203741e37d9d37098bfe260d7040e70f11023 (patch)
tree644cd4856e161d9c42ab804c88152fdd29771458
parent9ba66403fd1307fac258167d28d5a16facbe2521 (diff)
parent50e19a83585bd1aeae6aa01d31e5f783b7ef8b1b (diff)
downloadgit-fa8203741e37d9d37098bfe260d7040e70f11023.tar.gz
Merge branch 'rs/more-starts-with'
* rs/more-starts-with: Use starts_with() for C strings instead of memcmp()
-rw-r--r--builtin/for-each-ref.c2
-rw-r--r--fetch-pack.c2
-rw-r--r--remote.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 3e1d5c3334..4135980f20 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -193,7 +193,7 @@ static int verify_format(const char *format)
at = parse_atom(sp + 2, ep);
cp = ep + 1;
- if (!memcmp(used_atom[at], "color:", 6))
+ if (starts_with(used_atom[at], "color:"))
need_color_reset_at_eol = !!strcmp(used_atom[at], color_reset);
}
return 0;
diff --git a/fetch-pack.c b/fetch-pack.c
index eeee2bb7e0..b12bd4c59a 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -507,7 +507,7 @@ static void filter_refs(struct fetch_pack_args *args,
int keep = 0;
next = ref->next;
- if (!memcmp(ref->name, "refs/", 5) &&
+ if (starts_with(ref->name, "refs/") &&
check_refname_format(ref->name, 0))
; /* trash */
else {
diff --git a/remote.c b/remote.c
index 0e9459cc06..ae04043203 100644
--- a/remote.c
+++ b/remote.c
@@ -1194,7 +1194,7 @@ static int match_explicit(struct ref *src, struct ref *dst,
case 1:
break;
case 0:
- if (!memcmp(dst_value, "refs/", 5))
+ if (starts_with(dst_value, "refs/"))
matched_dst = make_linked_ref(dst_value, dst_tail);
else if (is_null_sha1(matched_src->new_sha1))
error("unable to delete '%s': remote ref does not exist",