diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-10-11 01:47:55 +0100 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2007-10-16 01:24:18 -0400 |
| commit | da0204df587ae76cd291bc7e495fc60d873c2f20 (patch) | |
| tree | 055c4c2ee5fcbbe3887ef4d9383d8b34bfa90104 /t | |
| parent | Support 'push --dry-run' for http transport (diff) | |
| download | tgif-da0204df587ae76cd291bc7e495fc60d873c2f20.tar.xz | |
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 <johannes.schindelin@gmx.de>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5510-fetch.sh | 8 | ||||
| -rwxr-xr-x | t/t5700-clone-reference.sh | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index 40ebf2e2bf..d217657146 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -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 +' + test_done diff --git a/t/t5700-clone-reference.sh b/t/t5700-clone-reference.sh index 4e93aaab02..b6a54867b4 100755 --- a/t/t5700-clone-reference.sh +++ b/t/t5700-clone-reference.sh @@ -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" |