path: root/t
diff options
authorJohannes Schindelin <>2007-10-11 00:47:55 (GMT)
committerShawn O. Pearce <>2007-10-16 05:24:18 (GMT)
commitda0204df587ae76cd291bc7e495fc60d873c2f20 (patch)
tree055c4c2ee5fcbbe3887ef4d9383d8b34bfa90104 /t
parentfe5d1d3eb42e6cf3dca93b2277be9464b026fcf2 (diff)
fetch: if not fetching from default remote, ignore default merge
When doing "git fetch <remote>" on a remote that does not have the branch referenced in branch.<current-branch>.merge, git fetch failed. It failed because it tried to add the "merge" ref to the refs to be fetched. Fix that. And add a test case. Incidentally, this unconvered a bug in our own test suite, where "git pull <some-path>" was expected to merge the ref given in the defaults, even if not pulling from the default remote. Signed-off-by: Johannes Schindelin <> Signed-off-by: Lars Hjemli <> Signed-off-by: Shawn O. Pearce <>
Diffstat (limited to 't')
2 files changed, 10 insertions, 2 deletions
diff --git a/t/ b/t/
index 40ebf2e..d217657 100755
--- a/t/
+++ b/t/
@@ -200,4 +200,12 @@ test_expect_success 'push via rsync' '
+test_expect_success 'fetch with a non-applying branch.<name>.merge' '
+ git config branch.master.remote yeti &&
+ git config branch.master.merge refs/heads/bigfoot &&
+ git config remote.blub.url one &&
+ git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
+ git fetch blub
diff --git a/t/ b/t/
index 4e93aaa..b6a5486 100755
--- a/t/
+++ b/t/
@@ -38,7 +38,7 @@ cd "$base_dir"
test_expect_success 'pulling from reference' \
'cd C &&
-git pull ../B'
+git pull ../B master'
cd "$base_dir"
@@ -61,7 +61,7 @@ test_expect_success 'existence of info/alternates' \
cd "$base_dir"
test_expect_success 'pulling from reference' \
-'cd D && git pull ../B'
+'cd D && git pull ../B master'
cd "$base_dir"