| commit | 25c200a70078054b59331d50509481d00647dcbf | |
| author | Elijah Newren <newren@gmail.com> | |
| Tue, 31 Jul 2018 17:12:04 +0000 (31 10:12 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 31 Jul 2018 19:51:09 +0000 (31 12:51 -0700) | ||
| tree | c4ad01a04524bd3982febee086c18aa1722c26fa | treesnapshot (tar.gz zip) |
| parent | 53f9a3e157dbbc901a02ac2c73346d375e24978c | commitdiff |
t1015: demonstrate directory/file conflict recovery failures
Several "recovery" commands outright fail or do not fully recover
when directory-file conflicts are present. This includes:
* git read-tree --reset HEAD
* git am --skip
* git am --abort
* git merge --abort
* git reset --hard
Add testcases documenting these shortcomings.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Several "recovery" commands outright fail or do not fully recover
when directory-file conflicts are present. This includes:
* git read-tree --reset HEAD
* git am --skip
* git am --abort
* git merge --abort
* git reset --hard
Add testcases documenting these shortcomings.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t1015-read-index-unmerged.sh | [new file with mode: 0755] | blob |