Allow git difftool --no-index to run outside of a worktree
#2175
Conversation
This file contains 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
We will always spawn something from `git difftool`, so we will always have to set `GIT_DIR` and `GIT_WORK_TREE`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
|
@FDpellet thank you for approving these changes. However, as this seems to be your first contribution to Git, I am not exactly sure on which bases you reviewed them. Did you test a locally-built Git? Did you review the actual code? Did you leave your check mark only as a joke? |
`OPT_ARGUMENT()` is intended to keep the specified long option in `argv` and not to do anything else. However, it would make a lot of sense for the caller to know whether this option was seen at all or not. For example, we want to teach `git difftool` to work outside of any Git worktree, but only when `--no-index` was specified. Note: nothing in Git uses OPT_ARGUMENT(). Even worse, looking through the commit history, one can easily see that nothing even ever used it, apart from the regression test. So not only do we make `OPT_ARGUMENT()` more useful, we are also about to introduce its first real user! Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
As far as this developer can tell, the conversion from a Perl script to a built-in caused the regression in the difftool that it no longer runs outside of a Git worktree (with `--no-index`, of course). It is a bit embarrassing that it took over two years after retiring the Perl version to discover this regression, but at least we now know, and can do something, about it. This fixes git-for-windows#2123 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In `--no-index` mode, we now no longer require a worktree nor a repository. But some code paths in `difftool` expect those to be present. The most notable such code path is the `--dir-diff` one: we use the existing checkout machinery to copy the files, and that machinery looks up replacement refs, looks at alternate ODBs, wants to use the worktree path, etc. Rather than running into segmentation faults, let's die with an informative error message. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This fixes git-for-windows#2123 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This patch addresses the segmentation faults in `git difftool --no-index --dir-diff`: surprisingly, those two options don't make no sense together. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
git-for-windows-ci
pushed a commit
that referenced
this pull request
May 8, 2019
Allow `git difftool --no-index` to run outside of a worktree
dscho
added a commit
that referenced
this pull request
May 9, 2019
Allow `git difftool --no-index` to run outside of a worktree
dscho
added a commit
that referenced
this pull request
May 9, 2019
Allow `git difftool --no-index` to run outside of a worktree
dscho
added a commit
that referenced
this pull request
May 9, 2019
Allow `git difftool --no-index` to run outside of a worktree
dscho
added a commit
to git-for-windows/build-extra
that referenced
this pull request
May 9, 2019
`git difftool --no-index` [can now be run outside of Git worktrees](git-for-windows/git#2175). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
git-for-windows-ci
pushed a commit
that referenced
this pull request
May 9, 2019
Allow `git difftool --no-index` to run outside of a worktree
dscho
added a commit
that referenced
this pull request
May 10, 2019
Allow `git difftool --no-index` to run outside of a worktree
dscho
added a commit
that referenced
this pull request
May 10, 2019
Allow `git difftool --no-index` to run outside of a worktree
dscho
added a commit
that referenced
this pull request
May 10, 2019
Allow `git difftool --no-index` to run outside of a worktree
git-for-windows-ci
pushed a commit
that referenced
this pull request
May 10, 2019
Allow `git difftool --no-index` to run outside of a worktree
git-for-windows-ci
pushed a commit
that referenced
this pull request
May 10, 2019
Allow `git difftool --no-index` to run outside of a worktree
git-for-windows-ci
pushed a commit
that referenced
this pull request
May 10, 2019
Allow `git difftool --no-index` to run outside of a worktree
dscho
added a commit
that referenced
this pull request
May 13, 2019
Allow `git difftool --no-index` to run outside of a worktree
dscho
added a commit
that referenced
this pull request
May 13, 2019
Allow `git difftool --no-index` to run outside of a worktree
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.
This addresses #2123
(Well, maybe I should try to get
git difftool --no-index --dir-diff -- ../1 ../2to work, but it seems like that project would be quite a bit more involved than I can afford right now...)