Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Investigate cherry-picking from forks #3

Open
hiddeco opened this issue Mar 7, 2023 · 4 comments
Open

Investigate cherry-picking from forks #3

hiddeco opened this issue Mar 7, 2023 · 4 comments

Comments

@hiddeco
Copy link
Member

hiddeco commented Mar 7, 2023

BTW, I found out about two maintained fork of gcfg:

The first one apparently has a very very nice capability: being able to edit a config file without deleting the comments a user might have put there. It would be great to cherry pick those commits. See for example git-bug/git-bug#1022 how that can cause problems.

Originally posted by @MichaelMure in #1 (comment)

@MichaelMure
Copy link

Things that could be interesting:

Now the "update a config without deleting comments" in https://github.com/please-build/gcfg is actually a fully separate parser with an AST. It has been developed in a series of PRs, each time squashed in a single commit:

Full diff of all those changes: go-gcfg/gcfg@1dd97f8...please-build:gcfg:769ce29126941afed3bbfc7a200e59ed7c345dac

There is other things, but it's either 1) less obvious to me if it's useful or 2) the history is less exploitable, with changes spread over time.

@hiddeco
Copy link
Member Author

hiddeco commented Mar 8, 2023

The minefield here is mostly (copyright) licensing, having a LICENSE file in the root directory of the repository does not help (or cover) for this when not accompanied by a sign-off.

@MichaelMure
Copy link

All of those changes are covered by the exact same license AND copyright as this repo, so why would that be a problem? Why would you need a sign-off? Of course asking is the right thing to do, but I don't see why it would be legally required (admittedly, IANAL).

@MichaelMure
Copy link

About that AST thing, it looks like it could replace most of plumbing/format/config in go-git, and how gcfg is used for that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants