[Libreoffice-commits] core.git: bin/git-new-module-workdir bin/git-new-workdir

[Thorsten Behrens]

 bin/git-new-module-workdir |   88 ---------------------------------------------
 bin/git-new-workdir        |   86 -------------------------------------------
 2 files changed, 174 deletions(-)

New commits:
commit 8d736a5495b123d967416aaaac6ad3b65536d1ca
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Thu Apr 5 00:13:18 2018 +0200

    remove git-new-workdir
    
    Seems that 'git worktree' is now the upstream-supported way to create
    light-weight working directories:
    
    https://blog.github.com/2015-07-29-git-2-5-including-multiple-worktrees-and-triangular-workflows/
    
    Change-Id: I9f019238b59686e2a7e924869ffd2e8d1d8e2269
    Reviewed-on: https://gerrit.libreoffice.org/52411
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/bin/git-new-module-workdir b/bin/git-new-module-workdir
deleted file mode 100755
index bfad184a308d..000000000000
--- a/bin/git-new-module-workdir
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-usage () {
-	echo "usage:" $@
-	exit 127
-}
-
-die () {
-	echo $@
-	exit 128
-}
-
-if test $# -lt 2 || test $# -gt 2
-then
-	usage "$0 <repository> <new_workdir>"
-fi
-
-orig_git=$1
-new_workdir=$2
-branch=$3
-
-# want to make sure that what is pointed to has a .git directory ...
-git_dir=$(cd "$orig_git" 2>/dev/null &&
-  git rev-parse --git-dir 2>/dev/null) ||
-  die "Not a git repository: \"$orig_git\""
-
-case "$git_dir" in
-.git)
-	git_dir="$orig_git/.git"
-	;;
-.)
-	git_dir=$orig_git
-	;;
-esac
-
-# don't link to a configured bare repository
-isbare=$(git --git-dir="$git_dir" config --bool --get core.bare)
-if test ztrue = z$isbare
-then
-	die "\"$git_dir\" has core.bare set to true," \
-		" remove from \"$git_dir/config\" to use $0"
-fi
-
-# don't link to a workdir
-if test -h "$git_dir/config"
-then
-	die "\"$orig_git\" is a working directory only, please specify" \
-		"a complete repository."
-fi
-
-if ! test -d ".git"
-then
-   die "the current directory is not a git workdir"
-fi
-
-# don't recreate a workdir over an existing repository
-if test -e "$new_workdir/.git"
-then
-	die "destination directory '$new_workdir' already exists."
-fi
-
-# make sure the links use full paths
-git_dir=$(cd "$git_dir"; pwd)
-
-# create the workdir
-mkdir -p ".git/modules/$new_workdir" || die "unable to create \".git/modules/$new_workdir\"!"
-
-# 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.
-## LEM: add branches; deprecated, but safer to include it
-for x in branches config refs logs/refs objects info hooks packed-refs remotes rr-cache svn
-do
-	case $x in
-	*/*)
-		mkdir -p "$(dirname ".git/modules/$new_workdir/$x")"
-		;;
-	esac
-	ln -s "$git_dir/$x" ".git/modules/$new_workdir/$x"
-done
-
-# now setup the workdir
-mkdir -p "$new_workdir"
-cd "$new_workdir"
-echo "gitdir: ../.git/modules/$new_workdir" > .git
-# copy the HEAD from the original repository as a default branch
-cp "$git_dir/HEAD" ../.git/modules/$new_workdir/HEAD
-# don't checkout the branch, a subsequent "git module update" will do it
diff --git a/bin/git-new-workdir b/bin/git-new-workdir
deleted file mode 100755
index 137ea082b4ec..000000000000
--- a/bin/git-new-workdir
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-usage () {
-	echo "usage:" $@
-	exit 127
-}
-
-die () {
-	echo $@
-	exit 128
-}
-
-if test $# -lt 2 || test $# -gt 3
-then
-	usage "$0 <repository> <new_workdir> [<branch>]"
-fi
-
-orig_git=$1
-new_workdir=$2
-branch=$3
-
-# want to make sure that what is pointed to has a .git directory ...
-git_dir=$(cd "$orig_git" 2>/dev/null &&
-  git rev-parse --git-dir 2>/dev/null) ||
-  die "Not a git repository: \"$orig_git\""
-
-case "$git_dir" in
-.git)
-	git_dir="$orig_git/.git"
-	;;
-.)
-	git_dir=$orig_git
-	;;
-esac
-
-# don't link to a configured bare repository
-isbare=$(git --git-dir="$git_dir" config --bool --get core.bare)
-if test ztrue = z$isbare
-then
-	die "\"$git_dir\" has core.bare set to true," \
-		" remove from \"$git_dir/config\" to use $0"
-fi
-
-# don't link to a workdir
-if test -L "$git_dir/config"
-then
-	die "\"$orig_git\" is a working directory only, please specify" \
-		"a complete repository."
-fi
-
-# don't recreate a workdir over an existing repository
-if test -e "$new_workdir"
-then
-	die "destination directory '$new_workdir' already exists."
-fi
-
-# make sure the links use full paths
-git_dir=$(cd "$git_dir"; pwd)
-
-# create the workdir
-mkdir -p "$new_workdir/.git" || die "unable to create \"$new_workdir\"!"
-
-# 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"
-done
-
-# now setup the workdir
-cd "$new_workdir"
-# copy the HEAD from the original repository as a default branch
-cp "$git_dir/HEAD" .git/HEAD
-# checkout the branch (either the same as HEAD from the original repository, or
-# the one that was asked for)
-git checkout -f $branch
-if test -n "$branch"
-then
-	git merge --ff-only '@{upstream}'
-fi