diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-10-24 21:59:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-10-24 21:59:50 -0700 |
| commit | d90a7fda355c251b8ffdd79617fb083c18245ec2 (patch) | |
| tree | dff9bc9d8e22b14c73cac403e65997a746aa03b2 /t/t5515/fetch.br-branches-one-octopus | |
| parent | 2db9b49c6c19d3edaa3c20147f7d9f29588433df (diff) | |
| parent | ca5bb5d5390e4ec709ca3e11c451c58a836d4ee6 (diff) | |
| download | git-d90a7fda355c251b8ffdd79617fb083c18245ec2.tar.gz | |
Merge branch 'db/fetch-pack'
* db/fetch-pack: (60 commits)
Define compat version of mkdtemp for systems lacking it
Avoid scary errors about tagged trees/blobs during git-fetch
fetch: if not fetching from default remote, ignore default merge
Support 'push --dry-run' for http transport
Support 'push --dry-run' for rsync transport
Fix 'push --all branch...' error handling
Fix compilation when NO_CURL is defined
Added a test for fetching remote tags when there is not tags.
Fix a crash in ls-remote when refspec expands into nothing
Remove duplicate ref matches in fetch
Restore default verbosity for http fetches.
fetch/push: readd rsync support
Introduce remove_dir_recursively()
bundle transport: fix an alloc_ref() call
Allow abbreviations in the first refspec to be merged
Prevent send-pack from segfaulting when a branch doesn't match
Cleanup unnecessary break in remote.c
Cleanup style nit of 'x == NULL' in remote.c
Fix memory leaks when disconnecting transport instances
Ensure builtin-fetch honors {fetch,transfer}.unpackLimit
...
Diffstat (limited to 't/t5515/fetch.br-branches-one-octopus')
| -rw-r--r-- | t/t5515/fetch.br-branches-one-octopus | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t5515/fetch.br-branches-one-octopus b/t/t5515/fetch.br-branches-one-octopus index 53fe808a3b..96e3029416 100644 --- a/t/t5515/fetch.br-branches-one-octopus +++ b/t/t5515/fetch.br-branches-one-octopus @@ -1,5 +1,6 @@ # br-branches-one-octopus 8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../ +6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' 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 ../ |