From f1e4fb2462894585d88c190aa9f16826f45ebbeb Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 9 Dec 2017 21:40:13 +0100 Subject: [PATCH] t4045: reindent to make helpers readable Signed-off-by: Junio C Hamano --- t/t4045-diff-relative.sh | 166 +++++++++++++++++++++++++---------------------- 1 file changed, 87 insertions(+), 79 deletions(-) rewrite t/t4045-diff-relative.sh (69%) diff --git a/t/t4045-diff-relative.sh b/t/t4045-diff-relative.sh dissimilarity index 69% index 22fcacfa33..6471a68701 100755 --- a/t/t4045-diff-relative.sh +++ b/t/t4045-diff-relative.sh @@ -1,79 +1,87 @@ -#!/bin/sh - -test_description='diff --relative tests' -. ./test-lib.sh - -test_expect_success 'setup' ' - git commit --allow-empty -m empty && - echo content >file1 && - mkdir subdir && - echo other content >subdir/file2 && - git add . && - git commit -m one -' - -check_diff() { -dir=$1; shift -expect=$1; shift -cat >expected <actual && - test_cmp expected actual -" -} - -check_numstat() { -dir=$1; shift -expect=$1; shift -cat >expected <expected && - git -C '$dir' diff --numstat $* HEAD^ >actual && - test_cmp expected actual -" -} - -check_stat() { -dir=$1; shift -expect=$1; shift -cat >expected <actual && - test_i18ncmp expected actual -" -} - -check_raw() { -dir=$1; shift -expect=$1; shift -cat >expected <actual && - test_cmp expected actual -" -} - -for type in diff numstat stat raw -do - check_$type . file2 --relative=subdir/ - check_$type . file2 --relative=subdir - check_$type subdir file2 --relative - check_$type . dir/file2 --relative=sub -done - -test_done +#!/bin/sh + +test_description='diff --relative tests' +. ./test-lib.sh + +test_expect_success 'setup' ' + git commit --allow-empty -m empty && + echo content >file1 && + mkdir subdir && + echo other content >subdir/file2 && + git add . && + git commit -m one +' + +check_diff () { + dir=$1 + shift + expect=$1 + shift + cat >expected <<-EOF + diff --git a/$expect b/$expect + new file mode 100644 + index 0000000..25c05ef + --- /dev/null + +++ b/$expect + @@ -0,0 +1 @@ + +other content + EOF + test_expect_success "-p $*" " + git -C '$dir' diff -p $* HEAD^ >actual && + test_cmp expected actual + " +} + +check_numstat () { + dir=$1 + shift + expect=$1 + shift + cat >expected <<-EOF + 1 0 $expect + EOF + test_expect_success "--numstat $*" " + echo '1 0 $expect' >expected && + git -C '$dir' diff --numstat $* HEAD^ >actual && + test_cmp expected actual + " +} + +check_stat () { + dir=$1 + shift + expect=$1 + shift + cat >expected <<-EOF + $expect | 1 + + 1 file changed, 1 insertion(+) + EOF + test_expect_success "--stat $*" " + git -C '$dir' diff --stat $* HEAD^ >actual && + test_i18ncmp expected actual + " +} + +check_raw () { + dir=$1 + shift + expect=$1 + shift + cat >expected <<-EOF + :000000 100644 0000000000000000000000000000000000000000 25c05ef3639d2d270e7fe765a67668f098092bc5 A $expect + EOF + test_expect_success "--raw $*" " + git -C '$dir' diff --no-abbrev --raw $* HEAD^ >actual && + test_cmp expected actual + " +} + +for type in diff numstat stat raw +do + check_$type . file2 --relative=subdir/ + check_$type . file2 --relative=subdir + check_$type subdir file2 --relative + check_$type . dir/file2 --relative=sub +done + +test_done -- 2.11.4.GIT