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

Two fixes for the built-in git add -i #2472

Merged
merged 2 commits into from
Jan 15, 2020

Conversation

dscho
Copy link
Member

@dscho dscho commented Jan 14, 2020

This PR intends to address #2466.

When the user does not select any files to `patch` or `diff`, there is
no need to call `run_add_p()` on them.

Even worse: we _have_ to avoid calling `parse_pathspec()` with an empty
list because that would trigger this error:

	BUG: pathspec.c:557: PATHSPEC_PREFER_CWD requires arguments

So let's avoid doing any work on a list of files that is empty anyway.

This fixes git-for-windows#2466.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho added this to the Next release milestone Jan 14, 2020
The interactive `add` command allows selecting multiple files for some
of its sub-commands, via unique prefixes, indices or index ranges.

When re-implementing `git add -i` in C, we even added a code comment
talking about ranges with a missing end index, such as `2-`, but the
code did not actually accept those, as pointed out in
git-for-windows#2466 (comment).

Let's fix this, and add a test case to verify that this stays fixed
forever.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho force-pushed the builtin-add-i-fixes branch from d5b6a16 to ff8149b Compare January 14, 2020 21:35
@dscho dscho merged commit 4001aef into git-for-windows:master Jan 15, 2020
git-for-windows-ci pushed a commit that referenced this pull request Jan 16, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Jan 16, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Jan 16, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Jan 17, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Jan 17, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Jan 17, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Jan 22, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Jan 22, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Jan 22, 2020
Two fixes for the built-in `git add -i`
dscho added a commit that referenced this pull request Jan 23, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Jan 24, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Jan 27, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Jan 27, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Jan 29, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Jan 29, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Jan 31, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Feb 1, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Feb 10, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Feb 11, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Feb 13, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Feb 17, 2020
Two fixes for the built-in `git add -i`
dscho added a commit to dscho/git that referenced this pull request Feb 17, 2020
git-for-windows-ci pushed a commit that referenced this pull request Feb 19, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Feb 26, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Mar 5, 2020
Two fixes for the built-in `git add -i`
dscho added a commit that referenced this pull request Mar 10, 2020
Two fixes for the built-in `git add -i`
git-for-windows-ci pushed a commit that referenced this pull request Mar 11, 2020
Two fixes for the built-in `git add -i`
dscho added a commit that referenced this pull request Mar 17, 2020
Two fixes for the built-in `git add -i`
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

Successfully merging this pull request may close these issues.

1 participant