t4045: reindent to make helpers readable
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
6d7c17ec9d
commit
f1e4fb2462
@ -12,60 +12,68 @@ test_expect_success 'setup' '
|
|||||||
git commit -m one
|
git commit -m one
|
||||||
'
|
'
|
||||||
|
|
||||||
check_diff() {
|
check_diff () {
|
||||||
dir=$1; shift
|
dir=$1
|
||||||
expect=$1; shift
|
shift
|
||||||
cat >expected <<EOF
|
expect=$1
|
||||||
diff --git a/$expect b/$expect
|
shift
|
||||||
new file mode 100644
|
cat >expected <<-EOF
|
||||||
index 0000000..25c05ef
|
diff --git a/$expect b/$expect
|
||||||
--- /dev/null
|
new file mode 100644
|
||||||
+++ b/$expect
|
index 0000000..25c05ef
|
||||||
@@ -0,0 +1 @@
|
--- /dev/null
|
||||||
+other content
|
+++ b/$expect
|
||||||
EOF
|
@@ -0,0 +1 @@
|
||||||
test_expect_success "-p $*" "
|
+other content
|
||||||
git -C '$dir' diff -p $* HEAD^ >actual &&
|
EOF
|
||||||
test_cmp expected actual
|
test_expect_success "-p $*" "
|
||||||
"
|
git -C '$dir' diff -p $* HEAD^ >actual &&
|
||||||
|
test_cmp expected actual
|
||||||
|
"
|
||||||
}
|
}
|
||||||
|
|
||||||
check_numstat() {
|
check_numstat () {
|
||||||
dir=$1; shift
|
dir=$1
|
||||||
expect=$1; shift
|
shift
|
||||||
cat >expected <<EOF
|
expect=$1
|
||||||
1 0 $expect
|
shift
|
||||||
EOF
|
cat >expected <<-EOF
|
||||||
test_expect_success "--numstat $*" "
|
1 0 $expect
|
||||||
echo '1 0 $expect' >expected &&
|
EOF
|
||||||
git -C '$dir' diff --numstat $* HEAD^ >actual &&
|
test_expect_success "--numstat $*" "
|
||||||
test_cmp expected actual
|
echo '1 0 $expect' >expected &&
|
||||||
"
|
git -C '$dir' diff --numstat $* HEAD^ >actual &&
|
||||||
|
test_cmp expected actual
|
||||||
|
"
|
||||||
}
|
}
|
||||||
|
|
||||||
check_stat() {
|
check_stat () {
|
||||||
dir=$1; shift
|
dir=$1
|
||||||
expect=$1; shift
|
shift
|
||||||
cat >expected <<EOF
|
expect=$1
|
||||||
$expect | 1 +
|
shift
|
||||||
1 file changed, 1 insertion(+)
|
cat >expected <<-EOF
|
||||||
EOF
|
$expect | 1 +
|
||||||
test_expect_success "--stat $*" "
|
1 file changed, 1 insertion(+)
|
||||||
git -C '$dir' diff --stat $* HEAD^ >actual &&
|
EOF
|
||||||
test_i18ncmp expected actual
|
test_expect_success "--stat $*" "
|
||||||
"
|
git -C '$dir' diff --stat $* HEAD^ >actual &&
|
||||||
|
test_i18ncmp expected actual
|
||||||
|
"
|
||||||
}
|
}
|
||||||
|
|
||||||
check_raw() {
|
check_raw () {
|
||||||
dir=$1; shift
|
dir=$1
|
||||||
expect=$1; shift
|
shift
|
||||||
cat >expected <<EOF
|
expect=$1
|
||||||
:000000 100644 0000000000000000000000000000000000000000 25c05ef3639d2d270e7fe765a67668f098092bc5 A $expect
|
shift
|
||||||
EOF
|
cat >expected <<-EOF
|
||||||
test_expect_success "--raw $*" "
|
:000000 100644 0000000000000000000000000000000000000000 25c05ef3639d2d270e7fe765a67668f098092bc5 A $expect
|
||||||
git -C '$dir' diff --no-abbrev --raw $* HEAD^ >actual &&
|
EOF
|
||||||
test_cmp expected actual
|
test_expect_success "--raw $*" "
|
||||||
"
|
git -C '$dir' diff --no-abbrev --raw $* HEAD^ >actual &&
|
||||||
|
test_cmp expected actual
|
||||||
|
"
|
||||||
}
|
}
|
||||||
|
|
||||||
for type in diff numstat stat raw
|
for type in diff numstat stat raw
|
||||||
|
Loading…
Reference in New Issue
Block a user