{"thread":{"id":"26472","subject":"t7610 is no longer valgrind-clean in pu","startedAt":"2011-02-11T10:46:07Z","lastAt":"2011-02-11T14:45:57Z","messageCount":2,"participants":["Thomas Rast","Martin von Zweigbergk"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"160889","messageId":"201102111146.07303.tr@thomasrast.ch","threadId":"26472","inReplyTo":null,"subject":"t7610 is no longer valgrind-clean in pu","fromName":"Thomas Rast","fromEmail":"tr@thomasrast.ch","sentAt":"2011-02-11T10:46:07Z","receivedAt":"2011-02-11T10:46:07Z","isPatch":false,"sender":{"key":"tr@thomasrast.ch","avatar":"https://avatars.githubusercontent.com/u/153510?v=4"},"body":"Hello Martin\n\nMy valgrind tester cronjob tells me the output below (some cruft\ntrimmed).  If you need any more data just ask :-)\n\n- Thomas\n\n> expecting success: \n>     git config rerere.enabled true &&\n>     rm -rf .git/rr-cache &&\n>     git checkout -b test5 branch1\n>     test_must_fail git merge master >/dev/null 2>&1 &&\n>     ( yes \"d\" \"d\" | git mergetool --no-prompt >/dev/null 2>&1 ) &&\n>     output=\"$(yes \"n\" | git mergetool --no-prompt)\" &&\n>     test \"$output\" = \"No files need merging\" &&\n>     git reset --hard\n> \n> Switched to a new branch 'test5'\n> ==25695== Invalid free() / delete / delete[]\n> ==25695==    at 0x4C20A31: free (vg_replace_malloc.c:325)\n> ==25695==    by 0x4F2538: string_list_clear (string-list.c:115)\n> ==25695==    by 0x466CE8: cmd_rerere (rerere.c:182)\n> ==25695==    by 0x404771: run_builtin (git.c:290)\n> ==25695==    by 0x4048FC: handle_internal_command (git.c:448)\n> ==25695==    by 0x4049E7: run_argv (git.c:492)\n> ==25695==    by 0x404B43: main (git.c:565)\n> ==25695==  Address 0x772388 is 0 bytes inside data symbol \"RERERE_UTIL_STAGED\"\n> ==25695== \n> ==25702== Invalid free() / delete / delete[]\n> ==25702==    at 0x4C20A31: free (vg_replace_malloc.c:325)\n> ==25702==    by 0x4F2538: string_list_clear (string-list.c:115)\n> ==25702==    by 0x466CE8: cmd_rerere (rerere.c:182)\n> ==25702==    by 0x404771: run_builtin (git.c:290)\n> ==25702==    by 0x4048FC: handle_internal_command (git.c:448)\n> ==25702==    by 0x4049E7: run_argv (git.c:492)\n> ==25702==    by 0x404B43: main (git.c:565)\n> ==25702==  Address 0x772388 is 0 bytes inside data symbol \"RERERE_UTIL_STAGED\"\n> ==25702== \n> ==26111== Invalid free() / delete / delete[]\n> ==26111==    at 0x4C20A31: free (vg_replace_malloc.c:325)\n> ==26111==    by 0x4F2538: string_list_clear (string-list.c:115)\n> ==26111==    by 0x466CE8: cmd_rerere (rerere.c:182)\n> ==26111==    by 0x404771: run_builtin (git.c:290)\n> ==26111==    by 0x4048FC: handle_internal_command (git.c:448)\n> ==26111==    by 0x4049E7: run_argv (git.c:492)\n> ==26111==    by 0x404B43: main (git.c:565)\n> ==26111==  Address 0x772388 is 0 bytes inside data symbol \"RERERE_UTIL_STAGED\"\n> ==26111== \n> ==26118== Invalid free() / delete / delete[]\n> ==26118==    at 0x4C20A31: free (vg_replace_malloc.c:325)\n> ==26118==    by 0x4F2538: string_list_clear (string-list.c:115)\n> ==26118==    by 0x466CE8: cmd_rerere (rerere.c:182)\n> ==26118==    by 0x404771: run_builtin (git.c:290)\n> ==26118==    by 0x4048FC: handle_internal_command (git.c:448)\n> ==26118==    by 0x4049E7: run_argv (git.c:492)\n> ==26118==    by 0x404B43: main (git.c:565)\n> ==26118==  Address 0x772388 is 0 bytes inside data symbol \"RERERE_UTIL_STAGED\"\n> ==26118== \n> ./test-lib.sh: line 1033: echo: write error: Broken pipe\n> not ok - 8 mergetool skips resolved paths when rerere is active\n> #\t\n> #\t    git config rerere.enabled true &&\n> #\t    rm -rf .git/rr-cache &&\n> #\t    git checkout -b test5 branch1\n> #\t    test_must_fail git merge master >/dev/null 2>&1 &&\n> #\t    ( yes \"d\" \"d\" | git mergetool --no-prompt >/dev/null 2>&1 ) &&\n> #\t    output=\"$(yes \"n\" | git mergetool --no-prompt)\" &&\n> #\t    test \"$output\" = \"No files need merging\" &&\n> #\t    git reset --hard\n> #\t\n> 6a53d958f3fa0ee2671517dca10837f42e1c57c1 is first bad commit\n> commit 6a53d958f3fa0ee2671517dca10837f42e1c57c1\n> Author: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>\n> Date:   Mon Feb 7 22:08:38 2011 -0500\n> \n>     mergetool: don't skip modify/remove conflicts\n\n-- \nThomas Rast\ntrast@{inf,student}.ethz.ch\n"},{"id":"160896","messageId":"alpine.DEB.2.00.1102110932360.21859@debian","threadId":"26472","inReplyTo":"201102111146.07303.tr@thomasrast.ch","subject":"Re: t7610 is no longer valgrind-clean in pu","fromName":"Martin von Zweigbergk","fromEmail":"martin.von.zweigbergk@gmail.com","sentAt":"2011-02-11T14:45:57Z","receivedAt":"2011-02-11T14:45:57Z","isPatch":false,"sender":{"key":"martinvonz@gmail.com","avatar":"https://avatars.githubusercontent.com/u/891642?v=4"},"body":"Hi,\n\nOn Fri, 11 Feb 2011, Thomas Rast wrote:\n\n> Hello Martin\n> \n> My valgrind tester cronjob tells me the output below (some cruft\n> trimmed).  If you need any more data just ask :-)\n> \n> > Switched to a new branch 'test5'\n> > ==25695== Invalid free() / delete / delete[]\n> > ==25695==    at 0x4C20A31: free (vg_replace_malloc.c:325)\n> > ==25695==    by 0x4F2538: string_list_clear (string-list.c:115)\n> > ==25695==    by 0x466CE8: cmd_rerere (rerere.c:182)\n> > ==25695==    by 0x404771: run_builtin (git.c:290)\n> > ==25695==    by 0x4048FC: handle_internal_command (git.c:448)\n> > ==25695==    by 0x4049E7: run_argv (git.c:492)\n> > ==25695==    by 0x404B43: main (git.c:565)\n> > ==25695==  Address 0x772388 is 0 bytes inside data symbol \"RERERE_UTIL_STAGED\"\n\nThis is most definitely the same thing as I reported in [1]. Thanks\nfor checking and sorry for submitting such a crappy patch :-(.\n\n/Martin\n\n\n [1] http://thread.gmane.org/gmane.comp.version-control.git/166329?focus=166535\n"}]}