diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-21 05:39:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 05:39:23 -0700 |
| commit | 443f26cbcac66368eb0ec8a8a250bf5815ad0a10 (patch) | |
| tree | 0363e0e85d5009e9e042b4d22410c6d95373d805 /t | |
| parent | 1b9fa0e81134df5c067efc1e3413f05c9e5043f8 (diff) | |
| parent | ac472ba65f75fbdbc52328f2bdc8645e5289e683 (diff) | |
| download | git-443f26cbcac66368eb0ec8a8a250bf5815ad0a10.tar.gz git-443f26cbcac66368eb0ec8a8a250bf5815ad0a10.tar.xz | |
Merge branch 'cb/assume-unchanged-fix' into maint
* cb/assume-unchanged-fix:
Documentation: git-add does not update files marked "assume unchanged"
do not overwrite files marked "assume unchanged"
Diffstat (limited to 't')
| -rwxr-xr-x | t/t2106-update-index-assume-unchanged.sh | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/t/t2106-update-index-assume-unchanged.sh b/t/t2106-update-index-assume-unchanged.sh new file mode 100755 index 000000000..99d858c6b --- /dev/null +++ b/t/t2106-update-index-assume-unchanged.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +test_description='git update-index --assume-unchanged test. +' + +. ./test-lib.sh + +test_expect_success 'setup' \ + ': >file && + git add file && + git commit -m initial && + git branch other && + echo upstream >file && + git add file && + git commit -m upstream' + +test_expect_success 'do not switch branches with dirty file' \ + 'git reset --hard && + git checkout other && + echo dirt >file && + git update-index --assume-unchanged file && + test_must_fail git checkout master' + +test_done |