summaryrefslogtreecommitdiff
path: root/refs.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-10 11:27:55 -0700
committerJunio C Hamano <gitster@pobox.com>2014-07-10 11:27:55 -0700
commit779c99fd68dcdaff7d996a1985914154a36a272c (patch)
tree5767ffcb836fcd23dffa73b0505243a146f334e8 /refs.c
parentdf4d7d56461c19361a6f32b633e850c7ba6e55e6 (diff)
parenta8d9fea772ca49c23ca3ee3d7625b9d1ed94f87f (diff)
downloadgit-779c99fd68dcdaff7d996a1985914154a36a272c.tar.gz
Merge branch 'dt/refs-check-refname-component-sse-fix'
Fixes to a topic that is already in 'master'. * dt/refs-check-refname-component-sse-fix: refs: fix valgrind suppression file refs.c: handle REFNAME_REFSPEC_PATTERN at end of page
Diffstat (limited to 'refs.c')
-rw-r--r--refs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/refs.c b/refs.c
index 20e2bf18c9..82e4842a36 100644
--- a/refs.c
+++ b/refs.c
@@ -153,6 +153,7 @@ int check_refname_format(const char *refname, int flags)
const __m128i tilde_lb = _mm_set1_epi8('~' - 1);
int component_count = 0;
+ int orig_flags = flags;
if (refname[0] == 0 || refname[0] == '/') {
/* entirely empty ref or initial ref component */
@@ -178,7 +179,7 @@ int check_refname_format(const char *refname, int flags)
* End-of-page; fall back to slow method for
* this entire ref.
*/
- return check_refname_format_bytewise(refname, flags);
+ return check_refname_format_bytewise(refname, orig_flags);
tmp = _mm_loadu_si128((__m128i *)cp);
tmp1 = _mm_loadu_si128((__m128i *)(cp + 1));