Skip to content

Commit

Permalink
Revert "Merge branch 'dt/refs-check-refname-component-sse-fix'"
Browse files Browse the repository at this point in the history
This reverts commit 779c99f, reversing
changes made to df4d7d5.
  • Loading branch information
Junio C Hamano committed Jul 28, 2014
1 parent 49f1cb9 commit dad2e7f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
3 changes: 1 addition & 2 deletions refs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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));
Expand Down
15 changes: 4 additions & 11 deletions t/valgrind/default.supp
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

0 comments on commit dad2e7f

Please sign in to comment.