[PATCH 2/3] fetch: switch allow-local off by default
And force it on in 'git push' to retain the old behavior.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
builtin/fetch.c | 2 +-
git-pull.sh | 2 +-
t/t5513-fetch-track.sh | 14 ++++++++++++++
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 2efbd7b..c65c75b 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -39,7 +39,7 @@ static struct strbuf default_rla = STRBUF_INIT;
static struct transport *transport;
static const char *submodule_prefix = "";
static const char *recurse_submodules_default;
-static int allow_local = 1;
+static int allow_local = 0;
static int option_parse_recurse_submodules(const struct option *opt,
const char *arg, int unset)
diff --git a/git-pull.sh b/git-pull.sh
index 638aabb..18c3793 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -220,7 +220,7 @@ 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
+git fetch $verbosity $progress $dry_run $recurse_submodules --update-head-ok --allow-local "$@" || exit 1
test -z "$dry_run" || exit 0
curr_head=$(git rev-parse -q --verify HEAD)
diff --git a/t/t5513-fetch-track.sh b/t/t5513-fetch-track.sh
index 65d1e05..cb46747 100755
--- a/t/t5513-fetch-track.sh
+++ b/t/t5513-fetch-track.sh
@@ -27,4 +27,18 @@ test_expect_success fetch '
)
'
+test_expect_success 'fetch no-local' '
+ (
+ test_create_repo another &&
+ cd another &&
+ git remote add origin .. &&
+ echo test > file &&
+ git add . &&
+ git commit -m test &&
+ git checkout -t -b local-tracking master &&
+ git fetch &&
+ git rev-parse --verify refs/remotes/origin/b/one
+ )
+'
+
test_done
--
1.8.3.rc1.579.g184e698
Felipe Contreras <felipe.contreras@gmail.com>