Question

我有一个使用--serparate-git-dir选项创建的git仓库。我经常通过指定--git-dir和--work-tree作为参数来使用相同的repo来形成不同的工作树。

我有两个工作树，我经常切换，所以我在辅助工作树中添加了一个.git文件，指向存储库目录。但是，由于存储库的config文件指向主工作树，我仍然必须明确指定它，否则它使用主工作树。

我尝试在worktree文件中将$PWD的值设置为.git/config，但这会导致以下错误： fatal: Could not chdir to '$PWD': No such file or directory

有没有办法使worktree动态化？

Answer 1

编辑05-2016 正如@amynbe评论，git＆gt; = 2.5有git-worktree https://git-scm.com/docs/git-worktree

我有一个脚本，freenode上有人传来，我不确定作者，但我知道我可以分享，它用于创建基于分支的不同工作副本，我认为它可以适合您的使用情况下：

#!/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 -h "$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

Answer 2

我遇到了类似的问题，我想让我的~/.gitconfig可以跨平台移植，这样我就可以在我的Macbook和Linux VM上使用相同的gitconfig。我需要credential.helper根据平台的不同而不同。

我最后编写了一个小generate_gitconfig脚本，并将其添加到我的bashrc中，以便在启动每个shell会话时自动生成~/.gitconfig。

通过脚本编写gitconfig，可以更灵活地根据环境变量动态设置值，是否安装了某些命令，机器的主机名等等。

以下是我的generate_gitconfig脚本，例如：

#!/bin/bash

cat <<EOF > $HOME/.gitconfig
# This gitconfig was generated via ~/.bin/generate_gitconfig.
# Edit that file, not this one!

[user]
    name = Dave Yarwood
    email = dave.yarwood@gmail.com
[push]
    default = simple
[core]
    autocrlf = input
    editor = nvim
    excludesfile = $HOME/.gitignore_global
[rerere]
    enabled = true
EOF

if [[ "$(uname)" == Darwin ]]; then
  CREDENTIAL_HELPER="osxkeychain"
elif [[ -n "$(which gnome-keyring-daemon)" ]]; then
  CREDENTIAL_HELPER="/usr/share/doc/git/contrib/credential/gnome-keyring/git-credential-gnome-keyring"
fi

if [[ -n "$CREDENTIAL_HELPER" ]]; then
  cat <<EOF >> $HOME/.gitconfig
[credential]
  helper = $CREDENTIAL_HELPER
EOF
fi

.git / config中的环境变量

2 个答案: