Add tests that check require_clean_work_tree() in the common cases,
i.e. on a branch with all combinations of clean and dirty index and
worktree, and also add tests that exercise it on an orphan branch.
require_clean_work_tree()'s behavior in the orphan branch cases is
questionable, as it exits with error on an orphan branch independently
from whether the index and worktree are clean or dirty (and it does so
because of the invalid HEAD, meaning that even when it should exit
with error, it does so for the wrong reason). As scripts might rely
on the current behavior, we err on the side of compatibility and
safety, and expect the current behavior as success.
Signed-off-by: SZEDER Gábor <szeder@xxxxxxxxxx>
---
t/t2301-require-clean-work-tree.sh | 63 ++++++++++++++++++++++++++++++++++++++
1 file changed, 63 insertions(+)
create mode 100755 t/t2301-require-clean-work-tree.sh
diff --git a/t/t2301-require-clean-work-tree.sh b/t/t2301-require-clean-work-tree.sh
new file mode 100755
index 0000000000..1bb41b59a5
--- /dev/null
+++ b/t/t2301-require-clean-work-tree.sh
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+test_description='require_clean_work_tree'
+
+. ./test-lib.sh
+
+run_require_clean_work_tree () {
+ (
+ . "$(git --exec-path)"/git-sh-setup &&
+ require_clean_work_tree "do-something"
+ )
+}
+
+test_expect_success 'setup' '
+ test_commit initial file
+'
+
+test_expect_success 'success on clean index and worktree' '
+ run_require_clean_work_tree
+'
+
+test_expect_success 'error on dirty worktree' '
+ test_when_finished "git reset --hard" &&
+ echo dirty >file &&
+ test_must_fail run_require_clean_work_tree
+'
+
+test_expect_success 'error on dirty index' '
+ test_when_finished "git reset --hard" &&
+ echo dirty >file &&
+ git add file &&
+ test_must_fail run_require_clean_work_tree
+'
+
+test_expect_success 'error on dirty index and worktree' '
+ test_when_finished "git reset --hard" &&
+ echo dirty >file &&
+ git add file &&
+ echo dirtier >file &&
+ test_must_fail run_require_clean_work_tree
+'
+
+test_expect_success 'error on clean index and worktree while on orphan branch' '
+ test_when_finished "git checkout master" &&
+ git checkout --orphan orphan &&
+ git reset --hard &&
+ test_must_fail run_require_clean_work_tree
+'
+
+test_expect_success 'error on dirty index while on orphan branch' '
+ test_when_finished "git checkout master" &&
+ git checkout --orphan orphan &&
+ test_must_fail run_require_clean_work_tree
+'
+
+test_expect_success 'error on dirty index and work tree while on orphan branch' '
+ test_when_finished "git checkout master" &&
+ git checkout --orphan orphan &&
+ echo dirty >file &&
+ test_must_fail run_require_clean_work_tree
+'
+
+test_done
--
2.6.3.418.gc3b7987
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html