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 /xdiff-interface.c | |
| 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 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions