You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
165 lines
3.9 KiB
165 lines
3.9 KiB
#!/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 && |
|
blob_file1=$(git hash-object file1) && |
|
blob_file2=$(git hash-object subdir/file2) && |
|
git add . && |
|
git commit -m one |
|
' |
|
|
|
check_diff () { |
|
dir=$1 |
|
shift |
|
expect=$1 |
|
shift |
|
short_blob=$(git rev-parse --short $blob_file2) |
|
cat >expected <<-EOF |
|
diff --git a/$expect b/$expect |
|
new file mode 100644 |
|
index 0000000..$short_blob |
|
--- /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 $ZERO_OID $blob_file2 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 |
|
|
|
check_diff_relative_option () { |
|
dir=$1 |
|
shift |
|
expect=$1 |
|
shift |
|
relative_opt=$1 |
|
shift |
|
test_expect_success "config diff.relative $relative_opt -p $*" " |
|
short_blob=\$(git rev-parse --short $blob_file2) && |
|
cat >expected <<-EOF && |
|
diff --git a/$expect b/$expect |
|
new file mode 100644 |
|
index 0000000..\$short_blob |
|
--- /dev/null |
|
+++ b/$expect |
|
@@ -0,0 +1 @@ |
|
+other content |
|
EOF |
|
test_config -C $dir diff.relative $relative_opt && |
|
git -C '$dir' diff -p $* HEAD^ >actual && |
|
test_cmp expected actual |
|
" |
|
} |
|
|
|
check_diff_no_relative_option () { |
|
dir=$1 |
|
shift |
|
expect=$1 |
|
shift |
|
relative_opt=$1 |
|
shift |
|
test_expect_success "config diff.relative $relative_opt -p $*" " |
|
short_blob_file1=\$(git rev-parse --short $blob_file1) && |
|
short_blob_file2=\$(git rev-parse --short $blob_file2) && |
|
cat >expected <<-EOF && |
|
diff --git a/file1 b/file1 |
|
new file mode 100644 |
|
index 0000000..\$short_blob_file1 |
|
--- /dev/null |
|
+++ b/file1 |
|
@@ -0,0 +1 @@ |
|
+content |
|
diff --git a/$expect b/$expect |
|
new file mode 100644 |
|
index 0000000..\$short_blob_file2 |
|
--- /dev/null |
|
+++ b/$expect |
|
@@ -0,0 +1 @@ |
|
+other content |
|
EOF |
|
test_config -C $dir diff.relative $relative_opt && |
|
git -C '$dir' diff -p $* HEAD^ >actual && |
|
test_cmp expected actual |
|
" |
|
} |
|
|
|
check_diff_no_relative_option . subdir/file2 false |
|
check_diff_no_relative_option . subdir/file2 true --no-relative |
|
check_diff_no_relative_option . subdir/file2 false --no-relative |
|
check_diff_no_relative_option subdir subdir/file2 false |
|
check_diff_no_relative_option subdir subdir/file2 true --no-relative |
|
check_diff_no_relative_option subdir subdir/file2 false --no-relative |
|
|
|
check_diff_relative_option . file2 false --relative=subdir/ |
|
check_diff_relative_option . file2 false --relative=subdir |
|
check_diff_relative_option . file2 true --relative=subdir/ |
|
check_diff_relative_option . file2 true --relative=subdir |
|
check_diff_relative_option subdir file2 false --relative |
|
check_diff_relative_option subdir file2 true --relative |
|
check_diff_relative_option subdir file2 true |
|
check_diff_relative_option subdir file2 false --no-relative --relative |
|
check_diff_relative_option subdir file2 true --no-relative --relative |
|
check_diff_relative_option . file2 false --no-relative --relative=subdir |
|
check_diff_relative_option . file2 true --no-relative --relative=subdir |
|
|
|
test_done
|
|
|