Two things I totally forgot #1864
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Since v2.9.0, Git knows about the config variable core.hookspath that allows overriding the path to the directory containing the Git hooks. Since v2.10.0, the `--git-path` option respects that config variable, too, so we may just as well use that command. For Git versions older than v2.5.0 (which was the first version to support the `--git-path` option for the `rev-parse` command), we simply fall back to the previous code. This fixes git-for-windows#1755 Initial-patch-by: Philipp Gortan <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
Let's try to address git-for-windows#1755 this way. Signed-off-by: Johannes Schindelin <[email protected]>
The constant `0` is not the correct one for pointers. Signed-off-by: Johannes Schindelin <[email protected]>
Ramsay pointed this out, but not in the email thread of the patches themselves, so I had missed this earlier. Signed-off-by: Johannes Schindelin <[email protected]>
jamill
approved these changes
Oct 4, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
One thing is a fix for a patch in the
builtin-rebasepart: it had been pointed out that one of the patches introduced a0where aNULLwould have been correct (I had missed this because it was not sent as a reply to the original mail thread).The other thing is more subtle, and even more worrisome: due to the way we start with a merging rebase, all patches that had been part of a previous branch thicket are assumed to be applied already. But this is not the case for branches we merged directly from https://github.com/gitster/git's branches: they would have to be re-applied. Previously, this was not a problem because merging rebases always rebased everything on top of the initial merge commit. But with the introduction of
git rebase --rebase-merges, we switched to that mode, and that mode uses theno-rebase-cousinsmode by default. Meaning: branches we merged that are not based on Git for Windows'master, but are based on commits reachable from core Git'smaster, are lost during merging rebases.I noticed this yesterday, by pure luck, with the patch that teaches Git GUI about
core.hooksPath. It was applied, but subsequently lost in a merging rebase.Happily, I could verify (by looking manually through the latest 10 merging rebases) that this was the only such case.
This PR addresses both oversights.