Re: [PATCH v4 8/8] t5520: check reflog action in fast-forward merge
flat view
From: Johannes Schindelin <hidden>
Date: 2016-06-15 23:04:48
Hi Paul, On 2015-05-18 15:32, Paul Tan wrote:
quoted hunk ↗ jump to hunk
@@ -95,7 +94,11 @@ test_expect_success 'test . as a remote' ' git checkout copy && test "$(cat file)" = file && git pull && - test "$(cat file)" = updated + test "$(cat file)" = updated && + git reflog -1 >reflog.actual && + 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.
quoted hunk ↗ jump to hunk
@@ -106,7 +109,11 @@ test_expect_success 'the default remote . shouldnot break explicit pull' ' git reset --hard HEAD^ && test "$(cat file)" = file && git pull . second && - test "$(cat file)" = modified + test "$(cat file)" = modified && + git reflog -1 >reflog.actual && + sed "s/$_x05[0-9a-f]*/OBJID/g" reflog.actual >reflog.fuzzy &&
Same here. Ciao, Dscho