Allow contrib new-workdir to link into bare repositories
On one particular system I like to keep a cluster of bare Git repositories and spawn new-workdirs off of them. Since the bare repositories don't have working directories associated with them they don't have a .git/ subdirectory that hosts the repository we are linking to. Using a bare repository as the backing repository for a workdir created by this script does require that the user delete core.bare from the repository's configuration file, so that Git auto-senses the bareness of a repository based on pathname information, and not based on the config file. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:

committed by
Junio C Hamano

parent
b33271808b
commit
2e4aef5893
@ -20,17 +20,19 @@ new_workdir=$2
|
|||||||
branch=$3
|
branch=$3
|
||||||
|
|
||||||
# want to make sure that what is pointed to has a .git directory ...
|
# want to make sure that what is pointed to has a .git directory ...
|
||||||
test -d "$orig_git/.git" || die "\"$orig_git\" is not a git repository!"
|
git_dir=$(cd "$orig_git" 2>/dev/null &&
|
||||||
|
git rev-parse --git-dir 2>/dev/null) ||
|
||||||
|
die "\"$orig_git\" is not a git repository!"
|
||||||
|
|
||||||
# don't link to a workdir
|
# don't link to a workdir
|
||||||
if test -L "$orig_git/.git/config"
|
if test -L "$git_dir/config"
|
||||||
then
|
then
|
||||||
die "\"$orig_git\" is a working directory only, please specify" \
|
die "\"$orig_git\" is a working directory only, please specify" \
|
||||||
"a complete repository."
|
"a complete repository."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# make sure the the links use full paths
|
# make sure the the links use full paths
|
||||||
orig_git=$(cd "$orig_git"; pwd)
|
git_dir=$(cd "$git_dir"; pwd)
|
||||||
|
|
||||||
# create the workdir
|
# create the workdir
|
||||||
mkdir -p "$new_workdir/.git" || die "unable to create \"$new_workdir\"!"
|
mkdir -p "$new_workdir/.git" || die "unable to create \"$new_workdir\"!"
|
||||||
@ -45,13 +47,13 @@ do
|
|||||||
mkdir -p "$(dirname "$new_workdir/.git/$x")"
|
mkdir -p "$(dirname "$new_workdir/.git/$x")"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
ln -s "$orig_git/.git/$x" "$new_workdir/.git/$x"
|
ln -s "$git_dir/$x" "$new_workdir/.git/$x"
|
||||||
done
|
done
|
||||||
|
|
||||||
# now setup the workdir
|
# now setup the workdir
|
||||||
cd "$new_workdir"
|
cd "$new_workdir"
|
||||||
# copy the HEAD from the original repository as a default branch
|
# copy the HEAD from the original repository as a default branch
|
||||||
cp "$orig_git/.git/HEAD" .git/HEAD
|
cp "$git_dir/HEAD" .git/HEAD
|
||||||
# checkout the branch (either the same as HEAD from the original repository, or
|
# checkout the branch (either the same as HEAD from the original repository, or
|
||||||
# the one that was asked for)
|
# the one that was asked for)
|
||||||
git checkout -f $branch
|
git checkout -f $branch
|
||||||
|
Reference in New Issue
Block a user