diff options
| -rw-r--r-- | .gitconfig | 21 | ||||
| -rwxr-xr-x | tools/git-setup | 26 |
2 files changed, 24 insertions, 23 deletions
diff --git a/.gitconfig b/.gitconfig index 4741c89385..3cbab41487 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,6 +1,8 @@ +# -*- Mode: Conf -*- + [remote "r-systemd"] url = https://github.com/systemd/systemd.git - tagopt = --no-tags + tagopt = --no-tags fetch = +refs/heads/*:refs/remotes/r-systemd/* fetch = +refs/tags/*:refs/tags/systemd/* [branch "systemd/master"] @@ -9,26 +11,25 @@ [remote "r-elogind"] url = https://github.com/wingo/elogind.git - tagopt = --no-tags + tagopt = --no-tags fetch = +refs/heads/*:refs/remotes/r-elogind/* fetch = +refs/tags/*:refs/tags/elogind/* [branch "elogind/master"] - remote = r-elogind - merge = refs/heads/master + remote = r-elogind + merge = refs/heads/master [remote "r-eudev"] - url = https://github.com/gentoo/eudev.git - tagopt = --no-tags + url = https://github.com/gentoo/eudev.git + tagopt = --no-tags fetch = +refs/heads/*:refs/remotes/r-eudev/* fetch = +refs/tags/*:refs/tags/eudev/* [branch "eudev/master"] - remote = r-eudev - merge = refs/heads/master + remote = r-eudev + merge = refs/heads/master [remote "r-parabola"] url = https://git.parabola.nu/~lukeshu/systemd.git pushUrl = ssh://git@git.parabola.nu/~git/~lukeshu/systemd.git - tagopt = --no-tags fetch = +refs/heads/*:refs/remotes/r-parabola/* [branch "systemd/parabola"] remote = r-parabola @@ -45,5 +46,5 @@ [remote "r-autothing"] url = git://lukeshu.com/autothing - tagopt = --no-tags + tagopt = --no-tags fetch = +refs/heads/*:refs/remotes/r-autothing/* diff --git a/tools/git-setup b/tools/git-setup index 6f3c36f1cb..f40a7724d9 100755 --- a/tools/git-setup +++ b/tools/git-setup @@ -3,21 +3,21 @@ cd "$(dirname -- "$0")" cd "$(git rev-parse --show-toplevel)" if [ -f .git/hooks/pre-commit.sample ] && [ ! -f .git/hooks/pre-commit ]; then - # This part is allowed to fail - cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \ - chmod +x .git/hooks/pre-commit && \ - echo "Activated pre-commit hook." || : + # This part is allowed to fail + cp -p .git/hooks/pre-commit.sample .git/hooks/pre-commit && \ + chmod +x .git/hooks/pre-commit && \ + echo "Activated pre-commit hook." || : fi declare -A fetch git config -f .gitconfig --get-regexp '.*' | while read -r key val; do - if [[ $key = *.fetch ]]; then - if [[ -z "${fetch[$key]}" ]]; then - git config --local --unset-all "$key" - fetch[$key]='true' - fi - git config --local --add "$key" "$val" - else - git config --local "$key" "$val" - fi + if [[ $key = *.fetch ]]; then + if [[ -z "${fetch[$key]}" ]]; then + git config --local --unset-all "$key" + fetch[$key]='true' + fi + git config --local --add "$key" "$val" + else + git config --local "$key" "$val" + fi done |