| commit | 52a0a1bd10f67ffb6d1eec420efed0899c606988 | |
| 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> | |
| Wed, 13 Oct 2010 21:34:08 +0000 (13 14:34 -0700) | ||
| tree | 6dc34a9c733de3a5b42a00fa199d64e8f3965fc3 | treesnapshot (tar.gz zip) |
| parent | c752e7f3e8d96a9673ad248addc9418164bd3ce6 | 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>
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>
| t/t7607-merge-overwrite.sh | diffblobblamehistory |