From: Paul Smith <paul@xxxxxxxxxxxxxxxxx>
Date: Thu, 13 Nov 2014 14:01:34 -0500
Subject: [PATCH] git-new-workdir: Add -f to force new-workdir in existing directory.
Signed-off-by: Paul Smith <psmith@xxxxxxxxxxxxxxxxx>
---
I have an environment I want to use new-workdir for, where the directory
I need to use is pre-created for me and I'm dropped into that directory
and I have no control over this (it's an automated build system). The
directory is empty but git-new-workdir still is unhappy about it. I
added a "-f" flag to allow the user to force git-new-workdir to continue
even if the directory exists. It still bails if there's a .git
directory already, however.
contrib/workdir/git-new-workdir | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/contrib/workdir/git-new-workdir b/contrib/workdir/git-new-workdir
index 75e8b25..a4079c1 100755
--- a/contrib/workdir/git-new-workdir
+++ b/contrib/workdir/git-new-workdir
@@ -10,11 +10,17 @@ die () {
exit 128
}
-if test $# -lt 2 || test $# -gt 3
+if test $# -lt 2 || test $# -gt 4
then
- usage "$0 <repository> <new_workdir> [<branch>]"
+ usage "$0 [-f] <repository> <new_workdir> [<branch>]"
fi
+force=false
+if [ x"$1" = x-f ]
+then
+ force=true
+ shift
+fi
orig_git=$1
new_workdir=$2
branch=$3
@@ -51,7 +57,11 @@ fi
# don't recreate a workdir over an existing repository
if test -e "$new_workdir"
then
- die "destination directory '$new_workdir' already exists."
+ $force || die "destination directory '$new_workdir' already exists."
+ if test -e "$new_workdir/.git"
+ then
+ die "destination directory '$new_workdir/.git' already exists."
+ fi
fi
# make sure the links use full paths
--
2.1.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