undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/cleanup-failed-clone' into maint

Browse Source 
An failure early in the "git clone" that started creating the
working tree and repository could have resulted in some directories
and files left without getting cleaned up.

* jk/cleanup-failed-clone:
  clone: drop period from end of die_errno message
  clone: initialize atexit cleanup handler earlier
This commit is contained in:
Junio C Hamano 2015-03-28 09:33:09 -07:00
commit 73d8bfde32
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/clone.c
View File

@ -842,20 +842,21 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
git_dir = mkpathdup("%s/.git", dir); git_dir = mkpathdup("%s/.git", dir);
} }
atexit(remove_junk);
sigchain_push_common(remove_junk_on_signal);
if (!option_bare) { if (!option_bare) {
junk_work_tree = work_tree;
if (safe_create_leading_directories_const(work_tree) < 0) if (safe_create_leading_directories_const(work_tree) < 0)
die_errno(_("could not create leading directories of '%s'"), die_errno(_("could not create leading directories of '%s'"),
work_tree); work_tree);
if (!dest_exists && mkdir(work_tree, 0777)) if (!dest_exists && mkdir(work_tree, 0777))
die_errno(_("could not create work tree dir '%s'."), die_errno(_("could not create work tree dir '%s'"),
work_tree); work_tree);
junk_work_tree = work_tree;
set_git_work_tree(work_tree); set_git_work_tree(work_tree);
} }
junk_git_dir = git_dir;
atexit(remove_junk);
sigchain_push_common(remove_junk_on_signal);
junk_git_dir = git_dir;
if (safe_create_leading_directories_const(git_dir) < 0) if (safe_create_leading_directories_const(git_dir) < 0)
die(_("could not create leading directories of '%s'"), git_dir); die(_("could not create leading directories of '%s'"), git_dir);