Environment Variables in .git / config

I have a git repository created using an option --serparate-git-dir. I often use the same repo as the other workers trees, specifying as arguments --git-dirand --work-tree.

I have two working trees that I switch between often, so I added the file .gitto the secondary work tree, pointing to the repository directory. However, since the repository file configpoints to the main working tree, I still have to explicitly point it, otherwise it uses the main working tree.

I tried setting the value worktreeto $PWDint in the file .git/config, but this causes the following error: fatal: Could not chdir to '$PWD': No such file or directory

Is there any way to make worktreedynamic?

+4
source share
2 answers

EDIT 05-2016 As @amynbe comments, git> = 2.5 has git -worktree https://git-scm.com/docs/git-worktree


I have a script that someone on freenode went through, I'm not sure about the author, but I know I can share it, it is used to create different working copies based on branches, I think this might fit your case:

#!/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
+1
source

I had a similar problem in that I wanted to make my ~/.gitconfigportable on different platforms so that I could use the same gitconfig on my Macbook and in my Linux VM. I need to be credential.helperdifferent depending on the platform.

generate_gitconfig script bashrc, ~/.gitconfig .

gitconfig script , , , ..

generate_gitconfig script, :

#!/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
+1

All Articles