Commit 32b5305fbed2d1a4c55b0eef6b93349b93ba7db0
2022-02-12T09:34:03
new test: `got diff' on files matched by an ignore pattern
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
diff --git a/regress/cmdline/diff.sh b/regress/cmdline/diff.sh
index 66d5c86..20900fc 100755
--- a/regress/cmdline/diff.sh
+++ b/regress/cmdline/diff.sh
@@ -1182,6 +1182,36 @@ test_diff_commits() {
test_done "$testroot" "$ret"
}
+test_diff_ignored_file() {
+ local testroot=`test_init diff_ignored_file`
+
+ got checkout $testroot/repo $testroot/wt > /dev/null
+ ret=$?
+ if [ $ret != 0 ]; then
+ test_done "$testroot" "$ret"
+ return 1
+ fi
+
+ echo 1 > $testroot/wt/number
+ (cd $testroot/wt && got add number >/dev/null)
+ (cd $testroot/wt && got commit -m 'add number' >/dev/null)
+
+ echo "**/number" > $testroot/wt/.gitignore
+
+ echo 2 > $testroot/wt/number
+ (cd $testroot/wt && got diff number | sed '1,/^@@/d' > $testroot/stdout)
+
+ echo "-1" > $testroot/stdout.expected
+ echo "+2" >> $testroot/stdout.expected
+
+ cmp -s $testroot/stdout.expected $testroot/stdout
+ ret=$?
+ if [ $ret != 0 ]; then
+ diff -u $testroot/stdout.expected $testroot/stdout
+ fi
+ test_done "$testroot" "$ret"
+}
+
test_parseargs "$@"
run_test test_diff_basic
run_test test_diff_shows_conflict
@@ -1193,3 +1223,4 @@ run_test test_diff_symlinks_in_work_tree
run_test test_diff_symlinks_in_repo
run_test test_diff_binary_files
run_test test_diff_commits
+run_test test_diff_ignored_file