diff options
| author | Clemens Buchacher <drizzd@aon.at> | 2010-10-10 10:35:43 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-14 08:09:56 -0800 |
| commit | 18a1d8953b9ee769761fa6a43c9bd6f76363421f (patch) | |
| tree | 56618812903a53dbaabd55cde64fc6ba1ea7ef5e /ws.c | |
| parent | 40d675f417f7b0be7b9367752701bf6bc03db091 (diff) | |
| download | git-18a1d8953b9ee769761fa6a43c9bd6f76363421f.tar.gz git-18a1d8953b9ee769761fa6a43c9bd6f76363421f.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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ws.c')
0 files changed, 0 insertions, 0 deletions