[swift-dev] Cleaning up stale branches?

[Daniel Dunbar]

> On Oct 21, 2016, at 9:57 AM, Mark Lacey <mark.lacey at apple.com> wrote:
> 
> 
>> On Oct 21, 2016, at 9:14 AM, Daniel Dunbar via swift-dev <swift-dev at swift.org <mailto:swift-dev at swift.org>> wrote:
>> 
>> While on this topic...
>> 
>> GitHub's support for doing cross-repo pull requests is excellent. Anyone can easily fork the main repo, and push to their side repo (for example, with: `git push ddunbar HEAD:name-of-my-new-branch`) and the GitHub web UI on the main repo will automatically show you a handy button for creating the PR.
> 
> You can also set the pushurl for a remote so that it goes to a different repo. This is what I do:
> $ git remote -v
> origin	git at github.com <mailto:git at github.com>:apple/swift.git (fetch)
> origin	git at github.com <mailto:git at github.com>:rudkx/swift.git (push)
> 
> This makes it possible to continue using ./utils/update-checkout to set up and update repos, with the one small step that you need to use ‘git config’ to set the pushurl after the initial clone.

Nice, thanks!

 - Daniel

> 
> Any ‘push’ thereafter will go to your fork.
> 
> The only minor annoyance I’ve run across is that ‘git fetch --prune’ and ‘git remote update --prune’ will delete tracking branches for things you push to your fork.
> 
>> With this level of support, IMHO branches usually should be pushed to individual's own repos, not the main repo.
> 
> I agree. This is how I’ve done all my PRs.
> 
> Mark
> 
> 
>> 
>>  - Daniel
>> 
>>> On Oct 21, 2016, at 5:50 AM, Alex Blewitt via swift-dev <swift-dev at swift.org <mailto:swift-dev at swift.org>> wrote:
>>> 
>>> There are a lot of branches in the main Swift Git repository at the moment. Many of these appear to be short-term testing branches that are out of date, or work in progress that may be better in an external repository until the work is done. There are also a number of branches (e.g. swift-3.0-preview-*-branch) which are in most cases out-of-step with the tags due to updating version numbers e.g.
>>> 
>>> 9cf1a6f807dd0d36eca20433341a4f1667616431 tag:swift-3.0-PREVIEW-5
>>> b687a0a9d3a4b588ee6c8ca5b43042bbd2fb8586 head:swift-3.0-preview-5-branch
>>> 
>>> Cleaning up the stale branches will allow others to focus on what the current work areas are, and what are the main branches to be pushing changes to.
>>> 
>>> $ git ls-remote --heads | cut -b-33 | xargs -n 1 git show -s --oneline "--pretty=format:%d %ar"
>>> From https://github.com/apple/swift <https://github.com/apple/swift>
>>>  (origin/SR-2545) 7 weeks ago
>>>  (origin/_fastCStringContents) 4 months ago
>>>  (origin/dabrahams-patch-1) 3 months ago
>>>  (origin/dabrahams-patch-3) 8 days ago
>>>  (origin/disable-associated-type-witness-inference) 4 months ago
>>>  (origin/distributed-test) 7 weeks ago
>>>  (origin/dwa-misc) 3 days ago
>>>  (origin/eager-bridging) 8 weeks ago
>>>  (origin/expression-breakup) 10 days ago
>>>  (origin/external-swift-stdlib) 4 weeks ago
>>>  (origin/inhibit-implicit-conversions) 6 months ago
>>>  (origin/jtbandes-patch-1) 5 weeks ago
>>>  (origin/line-directive-maintenance) 4 weeks ago
>>>  (origin/master, origin/HEAD) 10 hours ago
>>>  (origin/master-next) 2 days ago
>>>  (origin/moredistcc) 35 hours ago
>>>  (origin/new-integer-protocols) 15 hours ago
>>>  (origin/non-comparable-indices) 4 months ago
>>>  (origin/revert-5309-overlays-and-silgen_name) 2 days ago
>>>  (origin/rst-to-markdown) 5 months ago
>>>  (origin/runtime-fix-swift-error-box-comparison) 5 weeks ago
>>>  (origin/silgen-tests-should-build-modules) 7 weeks ago
>>>  (origin/stdlib-BidirectionalCollection.removeLast) 5 weeks ago
>>>  (origin/stdlib-default-RangeReplaceableCollection.SubSequence-3.0) 5 weeks ago
>>>  (origin/stdlib-indexing) 5 weeks ago
>>>  (tag: swift-2.2.1-SNAPSHOT-2016-04-23-a, origin/swift-2.2-branch) 6 months ago
>>>  (origin/swift-2.2-with-migration-attributes) 4 weeks ago
>>>  (origin/swift-2.3-branch) 9 weeks ago
>>>  (origin/swift-3-indexing-model-typechecker-bug-1) 7 months ago
>>>  (origin/swift-3.0-branch) 13 hours ago
>>>  (origin/swift-3.0-preview-1-branch) 4 months ago
>>>  (origin/swift-3.0-preview-2-branch) 4 months ago
>>>  (origin/swift-3.0-preview-3-branch) 3 months ago
>>>  (origin/swift-3.0-preview-4-branch) 3 months ago
>>>  (origin/swift-3.0-preview-5-branch) 3 months ago
>>>  (origin/swift-3.0-preview-5-speculative) 3 months ago
>>>  (origin/swift-3.0.1-preview-2-branch) 4 weeks ago
>>>  (origin/tests-mkdir-p) 7 weeks ago
>>>  (origin/underscore-playgroundquicklook) 2 months ago
>>>  (origin/update-checkout-script-for-2.3) 3 months ago
>>> 
>>> _______________________________________________
>>> swift-dev mailing list
>>> swift-dev at swift.org <mailto:swift-dev at swift.org>
>>> https://lists.swift.org/mailman/listinfo/swift-dev <https://lists.swift.org/mailman/listinfo/swift-dev>
>> 
>> _______________________________________________
>> swift-dev mailing list
>> swift-dev at swift.org <mailto:swift-dev at swift.org>
>> https://lists.swift.org/mailman/listinfo/swift-dev
> 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.swift.org/pipermail/swift-dev/attachments/20161021/6d50107b/attachment.html>