6aacb7d861
git-clone started respecting errors from the transport subsystem inaab179d937(builtin/clone.c: don't ignore transport_fetch_refs() errors, 2020-12-03). However, that commit didn't handle the cleanup of the filesystem quite right. The cleanup of the directory that cmd_clone() creates is done by an atexit() handler, which we control with a flag. It starts as JUNK_LEAVE_NONE ("clean up everything"), then progresses to JUNK_LEAVE_REPO when we know we have a valid repo but not working tree, and then finally JUNK_LEAVE_ALL when we have a successful checkout. Most errors cause us to die(), which then triggers the handler to do the right thing based on how far into cmd_clone() we got. But the checks added byaab179d937instead set the "err" variable and then jump to a new "cleanup" label, which then returns our non-zero status. However, the code after the cleanup label includes setting the flag to JUNK_LEAVE_ALL, and so we accidentally leave the repository and working tree in place. One obvious option to fix this is to reorder the end of the function to set the flag first, before cleanup code, and put the label between them. But we can observe another small bug: the error return from transport_fetch_refs() is generally "-1", and we propagate that to the return value of cmd_clone(), which ultimately becomes the exit code of the process. And we try to avoid transmitting negative values via exit codes (only the low 8 bits are passed along as an unsigned value, though in practice for "-1" this at least retains the property that it's non-zero). Instead, let's just die(). That makes us consistent with rest of the code in the function. It does add a new "fatal:" line to the output, but I'd argue that's a good thing: - in the rare case that the transport code didn't say anything, now the user gets _some_ error message - even if the transport code said something like "error: ssh died of signal 9", it's nice to also say "fatal" to indicate that we considered that to be a show-stopper. Triggering this in the test suite turns out to be surprisingly difficult. Almost every error we'd encounter, including ones deep inside the transport code, cause us to just die() right there! However, one way is to put a fake wrapper around git-upload-pack that sends the complete packfile but exits with a failure code. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
108 lines
2.9 KiB
Bash
Executable File
108 lines
2.9 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (C) 2006 Carl D. Worth <cworth@cworth.org>
|
|
#
|
|
|
|
test_description='test git clone to cleanup after failure
|
|
|
|
This test covers the fact that if git clone fails, it should remove
|
|
the directory it created, to avoid the user having to manually
|
|
remove the directory before attempting a clone again.
|
|
|
|
Unless the directory already exists, in which case we clean up only what we
|
|
wrote.
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
corrupt_repo () {
|
|
test_when_finished "rmdir foo/.git/objects.bak" &&
|
|
mkdir foo/.git/objects.bak/ &&
|
|
test_when_finished "mv foo/.git/objects.bak/* foo/.git/objects/" &&
|
|
mv foo/.git/objects/* foo/.git/objects.bak/
|
|
}
|
|
|
|
test_expect_success 'clone of non-existent source should fail' '
|
|
test_must_fail git clone foo bar
|
|
'
|
|
|
|
test_expect_success 'failed clone should not leave a directory' '
|
|
test_path_is_missing bar
|
|
'
|
|
|
|
test_expect_success 'create a repo to clone' '
|
|
test_create_repo foo
|
|
'
|
|
|
|
test_expect_success 'create objects in repo for later corruption' '
|
|
test_commit -C foo file
|
|
'
|
|
|
|
# source repository given to git clone should be relative to the
|
|
# current path not to the target dir
|
|
test_expect_success 'clone of non-existent (relative to $PWD) source should fail' '
|
|
test_must_fail git clone ../foo baz
|
|
'
|
|
|
|
test_expect_success 'clone should work now that source exists' '
|
|
git clone foo bar
|
|
'
|
|
|
|
test_expect_success 'successful clone must leave the directory' '
|
|
test_path_is_dir bar
|
|
'
|
|
|
|
test_expect_success 'failed clone --separate-git-dir should not leave any directories' '
|
|
corrupt_repo &&
|
|
test_must_fail git clone --separate-git-dir gitdir foo worktree &&
|
|
test_path_is_missing gitdir &&
|
|
test_path_is_missing worktree
|
|
'
|
|
|
|
test_expect_success 'failed clone into empty leaves directory (vanilla)' '
|
|
mkdir -p empty &&
|
|
corrupt_repo &&
|
|
test_must_fail git clone foo empty &&
|
|
test_dir_is_empty empty
|
|
'
|
|
|
|
test_expect_success 'failed clone into empty leaves directory (bare)' '
|
|
mkdir -p empty &&
|
|
corrupt_repo &&
|
|
test_must_fail git clone --bare foo empty &&
|
|
test_dir_is_empty empty
|
|
'
|
|
|
|
test_expect_success 'failed clone into empty leaves directory (separate)' '
|
|
mkdir -p empty-git empty-wt &&
|
|
corrupt_repo &&
|
|
test_must_fail git clone --separate-git-dir empty-git foo empty-wt &&
|
|
test_dir_is_empty empty-git &&
|
|
test_dir_is_empty empty-wt
|
|
'
|
|
|
|
test_expect_success 'failed clone into empty leaves directory (separate, git)' '
|
|
mkdir -p empty-git &&
|
|
corrupt_repo &&
|
|
test_must_fail git clone --separate-git-dir empty-git foo no-wt &&
|
|
test_dir_is_empty empty-git &&
|
|
test_path_is_missing no-wt
|
|
'
|
|
|
|
test_expect_success 'failed clone into empty leaves directory (separate, wt)' '
|
|
mkdir -p empty-wt &&
|
|
corrupt_repo &&
|
|
test_must_fail git clone --separate-git-dir no-git foo empty-wt &&
|
|
test_path_is_missing no-git &&
|
|
test_dir_is_empty empty-wt
|
|
'
|
|
|
|
test_expect_success 'transport failure cleans up directory' '
|
|
test_must_fail git clone --no-local \
|
|
-u "f() { git-upload-pack \"\$@\"; return 1; }; f" \
|
|
foo broken-clone &&
|
|
test_path_is_missing broken-clone
|
|
'
|
|
|
|
test_done
|