search

hraban / tomono

Multi- To Mono-repository merge
https://tomono.0brg.net
GNU Affero General Public License v3.0
842 stars 138 forks source link

Feature/folder name #22

Closed redthor closed 6 years ago

redthor commented 6 years ago

Hi there,

This PR is just to show you what I did. I don't expect it to be merged. I can submit another if you think some of it is worthwhile.

Basically I wanted to optionally pass a folder name with some depth, e.g.

echo '/home/user/repo.git library-package lib/packages/library-package' | tomono.sh

So in the monorepo you'll find ./lib/packages/library-package/*

I think I received an ls error at some point but otherwise it seems to work. Thanks for the script.

redthor commented 6 years ago

Hi there, I've made the changes. I wasn't sure about the instruction for rebasing? I think the branch was already up to date with master if that's what you meant?

I've reverted the whitespace commits. I imagine you can squash the PR to remove all the extra commits...

I've made the README change and "$name" change.

Thanks.

hraban commented 6 years ago

Thanks. I've rebased your patches to avoid thrashing the history and paralysing git blame, but otherwise no changes.

To maintainers:

Please don't merge this PR!

Merge #25 instead.

redthor commented 6 years ago

@hraban - quick git question: would squashing the merge commit avoid thrashing the history and paralysing git blame?

hraban commented 6 years ago

Yes, that's what I did in #25. Squash all commits except the readme, and move the last commit above the readme to squash it in, as well.

Assuming you're on branch feature/folder-name and your master is in line with ours; use git rebase -i master for that and move and mark lines appropriately. You'll want the VISUAL envvar set to your editor, e.g. 'vim' or 'emacs'.

redthor commented 6 years ago

Oh - I mean just use github to do it for you? e.g.

see this image

hraban commented 6 years ago

Ahh, gotcha. Yes, but I don’t have any write permissions on this repo :) I can only create prs, myself (left the company a few years back). The actual maintainers, God bless, come in once every few months and seem to merge everything without perhaps paying too much attention, so that could go wrong. :)

Gotta play the hand you’re dealt. In the end, the result is the same, though, no?

On 10 Apr 2018, at 01:11, Douglas Reith notifications@github.com wrote:

Oh - I mean just use github to do it for you? e.g.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or mute the thread.

redthor commented 6 years ago

lol, ok @hraban :)