diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2009-12-14 18:43:59 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-14 14:05:34 -0800 |
| commit | 7fce6e3c9a3cf652099ee5f0e52b59c407692044 (patch) | |
| tree | fe2e169e890c6868242b277f6d63afbc145e8995 /t/t7011-skip-worktree-reading.sh | |
| parent | 56cac48c3550de88d71b3944576d44337261d71b (diff) | |
| download | git-7fce6e3c9a3cf652099ee5f0e52b59c407692044.tar.gz | |
commit: correctly respect skip-worktree bit
Commit b4d1690 (Teach Git to respect skip-worktree bit (reading part))
fails to make "git commit -- a b c" respect skip-worktree
(i.e. not committing paths that are skip-worktree). This is because
when the index is reset back to HEAD, all skip-worktree information is
gone.
This patch saves skip-worktree information in the string list of
committed paths, then reuse it later on to skip skip-worktree paths.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7011-skip-worktree-reading.sh')
| -rwxr-xr-x | t/t7011-skip-worktree-reading.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7011-skip-worktree-reading.sh b/t/t7011-skip-worktree-reading.sh index e996928de2..bb4066f767 100755 --- a/t/t7011-skip-worktree-reading.sh +++ b/t/t7011-skip-worktree-reading.sh @@ -148,13 +148,13 @@ test_expect_success 'git-rm succeeds on skip-worktree absent entries' ' git rm 1 ' -test_expect_failure 'commit on skip-worktree absent entries' ' +test_expect_success 'commit on skip-worktree absent entries' ' git reset && setup_absent && test_must_fail git commit -m null 1 ' -test_expect_failure 'commit on skip-worktree dirty entries' ' +test_expect_success 'commit on skip-worktree dirty entries' ' git reset && setup_dirty && test_must_fail git commit -m null 1 |