Re: [PATCH v4 8/8] t5520: check reflog action in fast-forward merge

2015-05-21 Thread Paul Tan
Hi, On Mon, May 18, 2015 at 11:20 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: Hi Paul, On 2015-05-18 15:32, Paul Tan wrote: @@ -95,7 +94,11 @@ test_expect_success 'test . as a remote' ' git checkout copy test $(cat file) = file git pull - test $(cat

Re: [PATCH v4 8/8] t5520: check reflog action in fast-forward merge

2015-05-21 Thread Junio C Hamano
Paul Tan pyoka...@gmail.com writes: On Mon, May 18, 2015 at 11:20 PM, Johannes Schindelin ... + sed s/$_x05[0-9a-f]*/OBJID/g reflog.actual reflog.fuzzy Actually, let's use s/^[0-9a-f]*/OBJID/ instead: you only want to replace the first few characters. Did you mean