diff options
| author | Daniel Barkalow <barkalow@iabervon.org> | 2007-09-11 07:03:25 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-19 14:22:30 +0400 |
| commit | b888d61c8308027433df9c243fa551f42db1c76a (patch) | |
| tree | 94459873b07253fce86f467af8347f1a2d74f140 /t/t5515/fetch.br-branches-one-merge_branches-one | |
| parent | c7a8a16239c6bdbb4041dd8a8773ae055d3cccf8 (diff) | |
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_branches-one')
| -rw-r--r-- | t/t5515/fetch.br-branches-one-merge_branches-one | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5515/fetch.br-branches-one-merge_branches-one b/t/t5515/fetch.br-branches-one-merge_branches-one index 00e04b435e..e4b4fdee4c 100644 --- a/t/t5515/fetch.br-branches-one-merge_branches-one +++ b/t/t5515/fetch.br-branches-one-merge_branches-one @@ -1,5 +1,5 @@ # br-branches-one-merge branches-one -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 ../ |