diff options
| author | Paolo Bonzini <bonzini@gnu.org> | 2007-03-15 09:23:20 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-16 02:10:12 -0700 |
| commit | 9debc3241b5d54891600c839b4df4f48b2daa60c (patch) | |
| tree | 90fd68823d2d66689fedb191011b73373510a845 /t/t5520-pull.sh | |
| parent | 803527f1d9b284fa848d4a4bad23158c162a5d54 (diff) | |
| download | git-9debc3241b5d54891600c839b4df4f48b2daa60c.tar.gz git-9debc3241b5d54891600c839b4df4f48b2daa60c.tar.xz | |
git-fetch, git-branch: Support local --track via a special remote '.'
This patch adds support for a dummy remote '.' to avoid having
to declare a fake remote like
[remote "local"]
url = .
fetch = refs/heads/*:refs/heads/*
Such a builtin remote simplifies the operation of "git-fetch",
which will populate FETCH_HEAD but will not pretend that two
repositories are in use, will not create a thin pack, and will
not perform any useless remapping of names. The speed
improvement is around 20%, and it should improve more if
"git-fetch" is converted to a builtin.
To this end, git-parse-remote is grown with a new kind of
remote, 'builtin'. In git-fetch.sh, we treat the builtin remote
specially in that it needs no pack/store operations. In fact,
doing git-fetch on a builtin remote will simply populate
FETCH_HEAD appropriately.
The patch also improves of the --track/--no-track support,
extending it so that branch.<name>.remote items referring '.'
can be created. Finally, it fixes a typo in git-checkout.sh.
Signed-off-by: Paolo Bonzini <bonzini@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t5520-pull.sh')
| -rwxr-xr-x | t/t5520-pull.sh | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index 7eb37838b..243212d3d 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -29,5 +29,29 @@ test_expect_success 'checking the results' ' diff file cloned/file ' +test_expect_success 'test . as a remote' ' + + git branch copy master && + git config branch.copy.remote . && + git config branch.copy.merge refs/heads/master && + echo updated >file && + git commit -a -m updated && + git checkout copy && + test `cat file` = file && + git pull && + test `cat file` = updated +' + +test_expect_success 'the default remote . should not break explicit pull' ' + git checkout -b second master^ && + echo modified >file && + git commit -a -m modified && + git checkout copy && + git reset --hard HEAD^ && + test `cat file` = file && + git pull . second && + test `cat file` = modified +' + test_done |