diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2017-12-06 10:57:10 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2017-12-06 10:57:10 -0200 |
commit | a9b0c1d89e82452c0e799ae7e4674b991e8a011b (patch) | |
tree | 7107ca85f954260f976580dbb9c46ebadf3b36f2 | |
parent | a1d45ef0832f2b308c6464ee59ceb76916a93a97 (diff) | |
download | utils-git-a9b0c1d89e82452c0e799ae7e4674b991e8a011b.tar.gz utils-git-a9b0c1d89e82452c0e799ae7e4674b991e8a011b.tar.bz2 |
Ensure we have the right ssh command
-rwxr-xr-x | git-checkout-branch | 5 | ||||
-rwxr-xr-x | git-update-superproject | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/git-checkout-branch b/git-checkout-branch index 249ce93..a237a23 100755 --- a/git-checkout-branch +++ b/git-checkout-branch @@ -26,8 +26,11 @@ BASENAME="`basename $0`" # Checkout the branch containing a commit function checkout_branch { + # Ensure we have the right ssh command + GIT_SSH_COMMAND="`git config core.sshCommand`" + # Fetch from all repositories - git fetch --all + GIT_SSH_COMMAND="$GIT_SSH_COMMAND" git fetch --all # Check if we are in a detached HEAD if git branch | grep -q '* (HEAD detached'; then diff --git a/git-update-superproject b/git-update-superproject index 75ad999..a39efe6 100755 --- a/git-update-superproject +++ b/git-update-superproject @@ -12,9 +12,12 @@ if [ ! -e ".git" ]; then exit 1 fi +# Ensure we have the right ssh command +GIT_SSH_COMMAND="`git config core.sshCommand`" + # Run git fetch --all git pull $* || exit 1 git submodule sync --recursive -git submodule update --recursive --init +GIT_SSH_COMMAND="$GIT_SSH_COMMAND" git submodule update --recursive --init git submodules-checkout-branch |