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

git-new-workdir: don't fail if the target directory is empty

Browse Source 
Allow new workdirs to be created in an empty directory (similar to "git
clone").  Provide more error checking and clean up on failure.

Signed-off-by: Paul Smith <paul@mad-scientist.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Paul Smith 2014-11-26 15:38:28 -05:00 committed by Junio C Hamano
parent e69b1ce000
commit e32afab7b0
1 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
contrib/workdir/git-new-workdir
View File

@ -10,6 +10,10 @@ die () {
exit 128 exit 128
} }
failed () {
die "unable to create new workdir '$new_workdir'!"
}
if test $# -lt 2 || test $# -gt 3 if test $# -lt 2 || test $# -gt 3
then then
usage "$0 <repository> <new_workdir> [<branch>]" usage "$0 <repository> <new_workdir> [<branch>]"
@ -35,7 +39,7 @@ esac
# don't link to a configured bare repository # don't link to a configured bare repository
isbare=$(git --git-dir="$git_dir" config --bool --get core.bare) isbare=$(git --git-dir="$git_dir" config --bool --get core.bare)
if test ztrue = z$isbare if test ztrue = "z$isbare"
then then
die "\"$git_dir\" has core.bare set to true," \ die "\"$git_dir\" has core.bare set to true," \
" remove from \"$git_dir/config\" to use $0" " remove from \"$git_dir/config\" to use $0"
@ -48,35 +52,54 @@ then
"a complete repository." "a complete repository."
fi fi
# don't recreate a workdir over an existing repository # make sure the links in the workdir have full paths to the original repo
if test -e "$new_workdir" git_dir=$(cd "$git_dir" && pwd) || exit 1
# don't recreate a workdir over an existing directory, unless it's empty
if test -d "$new_workdir"
then then
die "destination directory '$new_workdir' already exists." if test $(ls -a1 "$new_workdir/." | wc -l) -ne 2
then
die "destination directory '$new_workdir' is not empty."
fi
cleandir="$new_workdir/.git"
else
cleandir="$new_workdir"
fi fi
# make sure the links use full paths mkdir -p "$new_workdir/.git" || failed
git_dir=$(cd "$git_dir"; pwd) cleandir=$(cd "$cleandir" && pwd) || failed
# create the workdir cleanup () {
mkdir -p "$new_workdir/.git" || die "unable to create \"$new_workdir\"!" rm -rf "$cleandir"
}
siglist="0 1 2 15"
trap cleanup $siglist
# create the links to the original repo. explicitly exclude index, HEAD and # create the links to the original repo. explicitly exclude index, HEAD and
# logs/HEAD from the list since they are purely related to the current working # logs/HEAD from the list since they are purely related to the current working
# directory, and should not be shared. # directory, and should not be shared.
for x in config refs logs/refs objects info hooks packed-refs remotes rr-cache svn for x in config refs logs/refs objects info hooks packed-refs remotes rr-cache svn
do do
# create a containing directory if needed
case $x in case $x in
*/*) */*)
mkdir -p "$(dirname "$new_workdir/.git/$x")" mkdir -p "$new_workdir/.git/${x%/*}"
;; ;;
esac esac
ln -s "$git_dir/$x" "$new_workdir/.git/$x"
ln -s "$git_dir/$x" "$new_workdir/.git/$x" || failed
done done
# now setup the workdir # commands below this are run in the context of the new workdir
cd "$new_workdir" cd "$new_workdir" || failed
# copy the HEAD from the original repository as a default branch # copy the HEAD from the original repository as a default branch
cp "$git_dir/HEAD" .git/HEAD cp "$git_dir/HEAD" .git/HEAD || failed
# checkout the branch (either the same as HEAD from the original repository, or
# the one that was asked for) # the workdir is set up. if the checkout fails, the user can fix it.
trap - $siglist
# checkout the branch (either the same as HEAD from the original repository,
# or the one that was asked for)
git checkout -f $branch git checkout -f $branch