David Turner <novalis@xxxxxxxxxxx> wrote: > Let's try this version. Thanks! Tested-by: Eric Wong <e@xxxxxxxxx> Not sure if t1512 would be the best place to put the test, but having a repo with ambiguous data already at hand was easiest. ---------8<------- Subject: [PATCH] t1512: test ambiguous cat-file --batch and --batch-output Test the new "ambiguous" result from cat-file --batch and --batch-check. This is in t1512 instead of t1006 since we need a repo with ambiguous object_id names. Signed-off-by: Eric Wong <e@xxxxxxxxx> --- t/t1512-rev-parse-disambiguation.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh index e4d5b56014..b0819630c9 100755 --- a/t/t1512-rev-parse-disambiguation.sh +++ b/t/t1512-rev-parse-disambiguation.sh @@ -388,4 +388,14 @@ test_expect_success C_LOCALE_OUTPUT 'ambiguous commits are printed by type first done ' +test_expect_success 'cat-file --batch and --batch-check show ambiguous' ' + echo "0000 ambiguous" >expect && + echo 0000 | git cat-file --batch-check >actual 2>err && + test_cmp expect actual && + grep hint: err && + echo 0000 | git cat-file --batch >actual 2>err && + test_cmp expect actual && + grep hint: err +' + test_done -- EW
