diff options
| author |  Clemens Buchacher <drizzd@aon.at> | 2010-10-10 10:35:43 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-10-13 14:34:08 -0700 |
| commit | 52a0a1bd10f67ffb6d1eec420efed0899c606988 (patch) | |
| tree | 6dc34a9c733de3a5b42a00fa199d64e8f3965fc3 /git-sh-setup.sh | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-52a0a1bd10f67ffb6d1eec420efed0899c606988.tar.xz | |
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>
Diffstat (limited to 'git-sh-setup.sh')
0 files changed, 0 insertions, 0 deletions