diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-02 13:37:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-02 13:37:16 -0800 |
| commit | f6276b788f26c3c148c2d5465a6b03fc09bb785c (patch) | |
| tree | 51087b88150e40113d3c90f3822f0e0c9e5a4caa /t/t5505-remote.sh | |
| parent | 86e67a088c581da4da36acf0edd8c27b1033e51e (diff) | |
| parent | b0ad11ea165e07308fc02a5091efbe2e2d22237c (diff) | |
| download | git-f6276b788f26c3c148c2d5465a6b03fc09bb785c.tar.gz git-f6276b788f26c3c148c2d5465a6b03fc09bb785c.tar.xz | |
Merge branch 'js/maint-fetch-update-head' into maint
* 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
Diffstat (limited to 't/t5505-remote.sh')
| -rwxr-xr-x | t/t5505-remote.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index c4496635d..0103e1a18 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -188,7 +188,7 @@ test_expect_success 'prune --dry-run' ' test_expect_success 'add --mirror && prune' ' (mkdir mirror && cd mirror && - git init && + git init --bare && git remote add --mirror -f origin ../one) && (cd one && git branch -m side2 side) && |