summaryrefslogtreecommitdiff
path: root/t/t5515/fetch.br-branches-one-merge
diff options
context:
space:
mode:
authorLibravatar Daniel Barkalow <barkalow@iabervon.org>2007-09-10 23:03:25 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-09-19 03:22:30 -0700
commitb888d61c8308027433df9c243fa551f42db1c76a (patch)
tree94459873b07253fce86f467af8347f1a2d74f140 /t/t5515/fetch.br-branches-one-merge
parentAdd bundle transport (diff)
downloadtgif-b888d61c8308027433df9c243fa551f42db1c76a.tar.xz
Make fetch a builtin
Thanks to Johannes Schindelin for review and fixes, and Julian Phillips for the original C translation. This changes a few small bits of behavior: branch.<name>.merge is parsed as if it were the lhs of a fetch refspec, and does not have to exactly match the actual lhs of a refspec, so long as it is a valid abbreviation for the same ref. branch.<name>.merge is no longer ignored if the remote is configured with a branches/* file. Neither behavior is useful, because there can only be one ref that gets fetched, but this is more consistant. Also, fetch prints different information to standard out. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515/fetch.br-branches-one-merge')
-rw-r--r--t/t5515/fetch.br-branches-one-merge2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5515/fetch.br-branches-one-merge b/t/t5515/fetch.br-branches-one-merge
index 3a4e77ead5..24099fd53e 100644
--- a/t/t5515/fetch.br-branches-one-merge
+++ b/t/t5515/fetch.br-branches-one-merge
@@ -1,5 +1,5 @@
# br-branches-one-merge
-8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge tag 'tag-master' of ../
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../