Subject: t7610 is no longer valgrind-clean in pu

From: Thomas Rast <[email-masked]>
Date: Fri, 11 Feb 2011 11:46:07 +0100

Hello Martin

My valgrind tester cronjob tells me the output below (some cruft
trimmed).  If you need any more data just ask :-)

- Thomas

> expecting success: 
>     git config rerere.enabled true &&
>     rm -rf .git/rr-cache &&
>     git checkout -b test5 branch1
>     test_must_fail git merge master >/dev/null 2>&1 &&
>     ( yes "d" "d" | git mergetool --no-prompt >/dev/null 2>&1 ) &&
>     output="$(yes "n" | git mergetool --no-prompt)" &&
>     test "$output" = "No files need merging" &&
>     git reset --hard
> 
> Switched to a new branch 'test5'
> ==25695== Invalid free() / delete / delete[]
> ==25695==    at 0x4C20A31: free (vg_replace_malloc.c:325)
> ==25695==    by 0x4F2538: string_list_clear (string-list.c:115)
> ==25695==    by 0x466CE8: cmd_rerere (rerere.c:182)
> ==25695==    by 0x404771: run_builtin (git.c:290)
> ==25695==    by 0x4048FC: handle_internal_command (git.c:448)
> ==25695==    by 0x4049E7: run_argv (git.c:492)
> ==25695==    by 0x404B43: main (git.c:565)
> ==25695==  Address 0x772388 is 0 bytes inside data symbol "RERERE_UTIL_STAGED"
> ==25695== 
> ==25702== Invalid free() / delete / delete[]
> ==25702==    at 0x4C20A31: free (vg_replace_malloc.c:325)
> ==25702==    by 0x4F2538: string_list_clear (string-list.c:115)
> ==25702==    by 0x466CE8: cmd_rerere (rerere.c:182)
> ==25702==    by 0x404771: run_builtin (git.c:290)
> ==25702==    by 0x4048FC: handle_internal_command (git.c:448)
> ==25702==    by 0x4049E7: run_argv (git.c:492)
> ==25702==    by 0x404B43: main (git.c:565)
> ==25702==  Address 0x772388 is 0 bytes inside data symbol "RERERE_UTIL_STAGED"
> ==25702== 
> ==26111== Invalid free() / delete / delete[]
> ==26111==    at 0x4C20A31: free (vg_replace_malloc.c:325)
> ==26111==    by 0x4F2538: string_list_clear (string-list.c:115)
> ==26111==    by 0x466CE8: cmd_rerere (rerere.c:182)
> ==26111==    by 0x404771: run_builtin (git.c:290)
> ==26111==    by 0x4048FC: handle_internal_command (git.c:448)
> ==26111==    by 0x4049E7: run_argv (git.c:492)
> ==26111==    by 0x404B43: main (git.c:565)
> ==26111==  Address 0x772388 is 0 bytes inside data symbol "RERERE_UTIL_STAGED"
> ==26111== 
> ==26118== Invalid free() / delete / delete[]
> ==26118==    at 0x4C20A31: free (vg_replace_malloc.c:325)
> ==26118==    by 0x4F2538: string_list_clear (string-list.c:115)
> ==26118==    by 0x466CE8: cmd_rerere (rerere.c:182)
> ==26118==    by 0x404771: run_builtin (git.c:290)
> ==26118==    by 0x4048FC: handle_internal_command (git.c:448)
> ==26118==    by 0x4049E7: run_argv (git.c:492)
> ==26118==    by 0x404B43: main (git.c:565)
> ==26118==  Address 0x772388 is 0 bytes inside data symbol "RERERE_UTIL_STAGED"
> ==26118== 
> ./test-lib.sh: line 1033: echo: write error: Broken pipe
> not ok - 8 mergetool skips resolved paths when rerere is active
> #	
> #	    git config rerere.enabled true &&
> #	    rm -rf .git/rr-cache &&
> #	    git checkout -b test5 branch1
> #	    test_must_fail git merge master >/dev/null 2>&1 &&
> #	    ( yes "d" "d" | git mergetool --no-prompt >/dev/null 2>&1 ) &&
> #	    output="$(yes "n" | git mergetool --no-prompt)" &&
> #	    test "$output" = "No files need merging" &&
> #	    git reset --hard
> #	
> 6a53d958f3fa0ee2671517dca10837f42e1c57c1 is first bad commit
> commit 6a53d958f3fa0ee2671517dca10837f42e1c57c1
> Author: Martin von Zweigbergk <[email-masked]>
> Date:   Mon Feb 7 22:08:38 2011 -0500
> 
>     mergetool: don't skip modify/remove conflicts

-- 
Thomas Rast
trast@{inf,student}.ethz.ch