On 02/09/2018 09:20 PM, Joey Hess wrote:> Yes; my patches are under the same GPL-2 as the rest of git.
Thanks! So here comes my patch series, heavily based on yours. There are some things to bear in mind while reviewing it: * This is my first real attempt at contributing to git, which means I could be very very far off-track * Most of it is based on trying to make the 6-year-old patch series work and pass all the tests, so if a new feature has been added since then I likely didn't notice it or don't know how to handle it correctly There are still three TODO's in the code: * In the documentation, one stating that I don't really get what this “ignore” parameter exactly does, and whether it should be handled specially (a prime example of a new feature I'm not really sure how to handle, somewhere in the code it's written all the “ignore” references are at the end of the list, but I'm already not self-confident enough about the difference between “merge” and “not-for-merge” to even consider making a good choice about how to handle “ignore”) * In `builtins/fetch.c`, function `do_fetch`, there is a conflict of interest between placing the `prune` before the `fetch` (as done by commit 10a6cc889 ("fetch --prune: Run prune before fetching", 2014-01-02)), and placing the `fetch` before the `prune` (which would allow hooks that rename the local-ref to not be prune'd and then re-fetched when doing a `git fetch --prune` -- without that a hook that would want to both read the old commit information and rename the local-ref would not be able to). Or maybe this question means actually there should be a third solution? but I don't really know what. Maybe also hooking into the prune operation? * In `templates/hooks--tweak-fetch.sample`, the “check this actually works” todo, as I'd rather first check this patch series is not too far off-topic before doing non-essential work -- anyway another version of the patch series will be required for the other two TODO's, so I can fix it at this point. That being said, what do you think about these patches? Thanks for your time! Leo Gaspard