>From 545c0d526eaa41f9306b567275a7d53799987482 Mon Sep 17 00:00:00 2001
From: Paul Smith <paul@xxxxxxxxxxxxxxxxx>
Date: Fri, 14 Nov 2014 17:11:19 -0500
Subject: [PATCH] git-new-workdir: Don't fail if the target directory is empty
Also provide more error checking and clean up on failure.
Signed-off-by: Paul Smith <paul@xxxxxxxxxxxxxxxxx>
---
Thanks Junio. I've reworked the change so it will automatically succeed
if the directory does not exists or exists but is empty, and fail
otherwise, which as far as I can tell is the behavior "git clone" uses
as well. I removed the -f flag as no longer needed. I also added some
cleanup that is performed if the new-workdir operation fails for any
reason so you don't get partly-constructed workdirs. I also added more
error checking so that we immediately stop if any step fails. Some may
suggest "set -e" but that flag can be tricky... I preferred to make the
failure explicit.
contrib/workdir/git-new-workdir | 54 +++++++++++++++++++++++++++++------------
1 file changed, 39 insertions(+), 15 deletions(-)
diff --git a/contrib/workdir/git-new-workdir b/contrib/workdir/git-new-workdir
index 75e8b25..c402000 100755
--- a/contrib/workdir/git-new-workdir
+++ b/contrib/workdir/git-new-workdir
@@ -10,6 +10,10 @@ die () {
exit 128
}
+failed () {
+ die "unable to create new workdir \"$new_workdir\"!"
+}
+
if test $# -lt 2 || test $# -gt 3
then
usage "$0 <repository> <new_workdir> [<branch>]"
@@ -48,35 +52,55 @@ then
"a complete repository."
fi
-# don't recreate a workdir over an existing repository
-if test -e "$new_workdir"
+# make sure the links use full paths
+git_dir=$(cd "$git_dir"; pwd)
+
+# don't recreate a workdir over an existing directory unless it's empty
+if test -d "$new_workdir"
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
+ was_existing=true
+else
+ mkdir -p "$new_workdir" || failed
+ was_existing=false
fi
-# make sure the links use full paths
-git_dir=$(cd "$git_dir"; pwd)
+cleanup () {
+ if $was_existing
+ then
+ rm -rf "$new_workdir"/* "$new_workdir"/.[!.] "$new_workdir"/.??*
+ else
+ rm -rf "$new_workdir"
+ fi
+}
+siglist="0 1 2 15"
+trap cleanup $siglist
-# create the workdir
-mkdir -p "$new_workdir/.git" || die "unable to create \"$new_workdir\"!"
+# create embedded directories
+for x in logs
+do
+ mkdir -p "$new_workdir/.git/$x" || failed
+done
# 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
# directory, and should not be shared.
for x in config refs logs/refs objects info hooks packed-refs remotes rr-cache svn
do
- case $x in
- */*)
- mkdir -p "$(dirname "$new_workdir/.git/$x")"
- ;;
- esac
- ln -s "$git_dir/$x" "$new_workdir/.git/$x"
+ ln -s "$git_dir/$x" "$new_workdir/.git/$x" || failed
done
# now setup the workdir
-cd "$new_workdir"
+cd "$new_workdir" || failed
# copy the HEAD from the original repository as a default branch
-cp "$git_dir/HEAD" .git/HEAD
+cp "$git_dir/HEAD" .git/HEAD || failed
+
+# don't delete the new workdir on exit
+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
--
1.8.5.3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html