From: Philip Peterson <philip.c.peterson@xxxxxxxxx> The old error text was shorter than the new, so this just adds the new context message to the expected text. Signed-off-by: Philip Peterson <philip.c.peterson@xxxxxxxxx> --- t/t4254-am-corrupt.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/t/t4254-am-corrupt.sh b/t/t4254-am-corrupt.sh index 45f1d4f95e5..265bcc41bbd 100755 --- a/t/t4254-am-corrupt.sh +++ b/t/t4254-am-corrupt.sh @@ -60,7 +60,14 @@ test_expect_success setup ' test_expect_success 'try to apply corrupted patch' ' test_when_finished "git am --abort" && test_must_fail git -c advice.amWorkDir=false am bad-patch.diff 2>actual && - echo "error: git diff header lacks filename information (line 4)" >expected && + space=" " && + echo \ +"error:$space + could not find header +caused by: + could not find file diff header +caused by: + git diff header lacks filename information (line 4)" >expected && test_path_is_file f && test_cmp expected actual ' -- gitgitgadget
