From dad2e7f4bf6e2f01bf2b589490441343a0f8f6f7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 28 Jul 2014 10:41:16 -0700 Subject: [PATCH] Revert "Merge branch 'dt/refs-check-refname-component-sse-fix'" This reverts commit 779c99fd68dcdaff7d996a1985914154a36a272c, reversing changes made to df4d7d56461c19361a6f32b633e850c7ba6e55e6. --- refs.c | 3 +-- t/valgrind/default.supp | 15 ++++----------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/refs.c b/refs.c index 84b9070b8d..3b030e62bd 100644 --- a/refs.c +++ b/refs.c @@ -153,7 +153,6 @@ 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 */ @@ -179,7 +178,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, orig_flags); + return check_refname_format_bytewise(refname, flags); tmp = _mm_loadu_si128((__m128i *)cp); tmp1 = _mm_loadu_si128((__m128i *)(cp + 1)); diff --git a/t/valgrind/default.supp b/t/valgrind/default.supp index 9d51c92b74..332ab1a3b3 100644 --- a/t/valgrind/default.supp +++ b/t/valgrind/default.supp @@ -50,17 +50,10 @@ fun:copy_ref } { - ignore-sse-check_refname_format-addr + ignore-sse-check_refname_format Memcheck:Addr8 fun:check_refname_format -} -{ - ignore-sse-check_refname_format-cond - Memcheck:Cond - fun:check_refname_format -} -{ - ignore-sse-check_refname_format-value - Memcheck:Value8 - fun:check_refname_format + fun:cmd_check_ref_format + fun:handle_builtin + fun:main } -- 2.11.4.GIT