diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-09-14 16:53:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-17 23:57:35 -0700 |
| commit | cba8d4896187abedd9c35936504b7254a2ecbd91 (patch) | |
| tree | 0bcdd7d7d7ed7a2fe7c547c1f7c27a029e83c559 /t | |
| parent | 64586e75af3c84844b80652575a8b63a9612b24a (diff) | |
| download | git-cba8d4896187abedd9c35936504b7254a2ecbd91.tar.gz git-cba8d4896187abedd9c35936504b7254a2ecbd91.tar.xz | |
git-commit: partial commit of paths only removed from the index
Because a partial commit is meant to be a way to ignore what are
staged in the index, "git rm --cached A && git commit A" should
just record what is in A on the filesystem. The previous patch
made the command sequence to barf, saying that A has not been
added yet. This fixes it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rw-r--r-- | t/t7501-commit.sh | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index f178f5620..b151b51a3 100644 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -131,7 +131,7 @@ test_expect_success \ 'validate git-rev-list output.' \ 'diff current expected' -test_expect_success 'partial commit that involve removal (1)' ' +test_expect_success 'partial commit that involves removal (1)' ' git rm --cached file && mv file elif && @@ -143,7 +143,7 @@ test_expect_success 'partial commit that involve removal (1)' ' ' -test_expect_success 'partial commit that involve removal (2)' ' +test_expect_success 'partial commit that involves removal (2)' ' git commit -m "Partial: remove file" file && git diff-tree --name-status HEAD^ HEAD >current && @@ -152,4 +152,15 @@ test_expect_success 'partial commit that involve removal (2)' ' ' +test_expect_success 'partial commit that involves removal (3)' ' + + git rm --cached elif && + echo elif >elif && + git commit -m "Partial: modify elif" elif && + git diff-tree --name-status HEAD^ HEAD >current && + echo "M elif" >expected && + diff expected current + +' + test_done |