| commit | 18a1d8953b9ee769761fa6a43c9bd6f76363421f | |
| author | Clemens Buchacher <drizzd@aon.at> | |
| Sun, 10 Oct 2010 08:35:43 +0000 (10 10:35 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 14 Dec 2010 16:09:56 +0000 (14 08:09 -0800) | ||
| tree | 56618812903a53dbaabd55cde64fc6ba1ea7ef5e | treesnapshot (tar.gz zip) |
| parent | 40d675f417f7b0be7b9367752701bf6bc03db091 | commitdiff |
t7607: use test-lib functions and check MERGE_HEAD
Use the test_commit and test_path_is_missing
functions from the test library.
Also make sure that a merge which fails due to
pre-merge checks aborts properly and does not
leave MERGE_HEAD behind.
The "will not overwrite removed file" test is an
exception to this. It notices the untracked file
at a stage where the merge is already well under
way. Therefore we cannot abort the merge without
major restructuring. See the following thread for
more details.
http://mid.gmane.org/7vskopwxej.fsf@gitster.siamese.dyndns.org
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Use the test_commit and test_path_is_missing
functions from the test library.
Also make sure that a merge which fails due to
pre-merge checks aborts properly and does not
leave MERGE_HEAD behind.
The "will not overwrite removed file" test is an
exception to this. It notices the untracked file
at a stage where the merge is already well under
way. Therefore we cannot abort the merge without
major restructuring. See the following thread for
more details.
http://mid.gmane.org/7vskopwxej.fsf@gitster.siamese.dyndns.org
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7607-merge-overwrite.sh | diffblobblamehistory |