diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2014-02-04 09:20:09 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-02-05 16:44:51 -0800 |
| commit | b4b313f94ab06fabe78fa91b3f2ebbc7ef08b012 (patch) | |
| tree | 7d11a0d21b8aae16296b29abaf0d1c150d31398f /t/t7102-reset.sh | |
| parent | Git 1.9-rc2 (diff) | |
| download | tgif-b4b313f94ab06fabe78fa91b3f2ebbc7ef08b012.tar.xz | |
reset: support "--mixed --intent-to-add" mode
When --mixed is used, entries could be removed from index if the
target ref does not have them. When "reset" is used in preparation for
commit spliting (in a dirty worktree), it could be hard to track what
files to be added back. The new option --intent-to-add simplifies it
by marking all removed files intent-to-add.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Diffstat (limited to 't/t7102-reset.sh')
| -rwxr-xr-x | t/t7102-reset.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh index 8d4b50d1b5..bc0846f435 100755 --- a/t/t7102-reset.sh +++ b/t/t7102-reset.sh @@ -535,4 +535,19 @@ test_expect_success 'reset with paths accepts tree' ' git diff HEAD --exit-code ' +test_expect_success 'reset -N keeps removed files as intent-to-add' ' + echo new-file >new-file && + git add new-file && + git reset -N HEAD && + + tree=$(git write-tree) && + git ls-tree $tree new-file >actual && + >expect && + test_cmp expect actual && + + git diff --name-only >actual && + echo new-file >expect && + test_cmp expect actual +' + test_done |