[RFC/PATCH 1/3] remote: don't override default if cur head remote is '.'
From: Felipe Contreras <hidden>
Date: 2016-06-15 22:57:16
Subsystem:
the rest · Maintainer:
Linus Torvalds
'git fetch .' makes no sense, so let's keep using the default ('origin')
when the current branch's remote is '.'.
Also update 'git pull' so that pulling works the same way as before.
Signed-off-by: Felipe Contreras <redacted>
---
git-pull.sh | 9 ++++++++-
remote.c | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index 638aabb..75297c7 100755
--- a/git-pull.sh
+++ b/git-pull.sh@@ -220,7 +220,14 @@ test true = "$rebase" && { done } orig_head=$(git rev-parse -q --verify HEAD) -git fetch $verbosity $progress $dry_run $recurse_submodules --update-head-ok "$@" || exit 1 +# get the default remote +remote="$(git config "branch.$curr_branch_short.remote")" +if test $# == 0 && test -n "$remote" +then + git fetch $verbosity $progress $dry_run $recurse_submodules --update-head-ok "$remote" || exit 1 +else + git fetch $verbosity $progress $dry_run $recurse_submodules --update-head-ok "$@" || exit 1 +fi test -z "$dry_run" || exit 0 curr_head=$(git rev-parse -q --verify HEAD)
diff --git a/remote.c b/remote.c
index 68eb99b..322a1b6 100644
--- a/remote.c
+++ b/remote.c@@ -360,7 +360,7 @@ static int handle_config(const char *key, const char *value, void *cb) if (!strcmp(subkey, ".remote")) { if (git_config_string(&branch->remote_name, key, value)) return -1; - if (branch == current_branch) { + if (branch == current_branch && strcmp(branch->remote_name, ".")) { default_remote_name = branch->remote_name; explicit_default_remote_name = 1; }
--
1.8.3.rc1.579.g184e698