summaryrefslogtreecommitdiff
path: root/builtin/clone.c
diff options
context:
space:
mode:
authorJens Lehmann <Jens.Lehmann@web.de>2013-01-05 20:17:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-01-06 06:44:11 (GMT)
commit9be1980bb966cb1bc187b62803e6b76087fd5aac (patch)
tree33791596e547e797591589685038a722c7726bc2 /builtin/clone.c
parentb57fb80a7d7d19102b31ab94a28ed43ea1ee07bb (diff)
downloadgit-9be1980bb966cb1bc187b62803e6b76087fd5aac.zip
git-9be1980bb966cb1bc187b62803e6b76087fd5aac.tar.gz
git-9be1980bb966cb1bc187b62803e6b76087fd5aac.tar.bz2
clone: support atomic operation with --separate-git-dir
Since b57fb80a7d (init, clone: support --separate-git-dir for .git file) git clone supports the --separate-git-dir option to create the git dir outside the work tree. But when that option is used, the git dir won't be deleted in case the clone fails like it would be without this option. This makes clone lose its atomicity as in case of a failure a partly set up git dir is left behind. A real world example where this leads to problems is when "git submodule update" fails to clone a submodule and later calls to "git submodule update" stumble over the partially set up git dir and try to revive the submodule from there, which then fails with a not very user friendly error message. Fix that by updating the junk_git_dir variable (used to remember if and what git dir should be removed in case of failure) to the new value given with the --seperate-git-dir option. Also add a test for this to t5600 (and while at it fix the former last test to not cd into a directory to test for its existence but use "test -d" instead). Reported-by: Manlio Perillo <manlio.perillo@gmail.com> Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/clone.c')
-rw-r--r--builtin/clone.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/clone.c b/builtin/clone.c
index 097beca..b054313 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -471,8 +471,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
die("could not create leading directories of '%s'", git_dir);
set_git_dir_init(git_dir, real_git_dir, 0);
- if (real_git_dir)
+ if (real_git_dir) {
git_dir = real_git_dir;
+ junk_git_dir = real_git_dir;
+ }
if (0 <= option_verbosity)
printf("Cloning into %s%s...\n",