diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-10-21 17:58:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-21 17:58:21 -0700 |
| commit | ca6c06b2efe2f55c498670efcb419bce35678e03 (patch) | |
| tree | 741239f028d57d825b8bbd66df8271ad0576bbe0 /t/t9300-fast-import.sh | |
| parent | Merge branch 'jc/maint-co-track' (diff) | |
| parent | pull: allow "git pull origin $something:$current_branch" into an unborn branch (diff) | |
| download | tgif-ca6c06b2efe2f55c498670efcb419bce35678e03.tar.xz | |
Merge branch 'js/maint-fetch-update-head'
* js/maint-fetch-update-head:
pull: allow "git pull origin $something:$current_branch" into an unborn branch
Fix fetch/pull when run without --update-head-ok
Conflicts:
t/t5510-fetch.sh
Diffstat (limited to 't/t9300-fast-import.sh')
| -rwxr-xr-x | t/t9300-fast-import.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 328444a306..91b5aced1b 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -983,7 +983,7 @@ test_expect_success \ git checkout subuse1 && rm -rf sub && mkdir sub && cd sub && git init && - git fetch .. refs/heads/sub:refs/heads/master && + git fetch --update-head-ok .. refs/heads/sub:refs/heads/master && git checkout master && cd .. && git submodule init && |