git/git-add--interactive.perl, branch v2.16.2

add--interactive: ignore submodule changes except HEAD

2018-01-16T20:32:45Z

For 'add -i' and 'add -p', the only action we can take on a dirty submodule entry is update the index with a new value from its HEAD. The content changes inside (from its own index, untracked files...) do not matter, at least until 'git add -i' learns about launching a new interactive add session inside a submodule. Ignore all other submodules changes except HEAD. This reduces the number of entries the user has to check through in 'git add -i', and the number of 'no' they have to answer to 'git add -p' when dirty submodules are present. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Merge branch 'pw/unquote-path-in-git-pm'

2017-07-10T20:42:50Z

Code refactoring. * pw/unquote-path-in-git-pm: t9700: add tests for Git::unquote_path() Git::unquote_path(): throw an exception on bad path Git::unquote_path(): handle '\a' add -i: move unquote_path() to Git.pm

add -i: move unquote_path() to Git.pm

2017-06-30T15:02:20Z

Move unquote_path() from git-add--interactive to Git.pm so it can be used by other scripts. Note this is a straight copy, it does not handle '\a'. That will be fixed in the next commit. Signed-off-by: Phillip Wood Signed-off-by: Junio C Hamano

Merge branch 'jk/add-p-commentchar-fix'

2017-06-26T21:09:31Z

"git add -p" were updated in 2.12 timeframe to cope with custom core.commentchar but the implementation was buggy and a metacharacter like $ and * did not work. * jk/add-p-commentchar-fix: add--interactive: quote commentChar regex add--interactive: handle EOF in prompt_yesno

add--interactive: quote commentChar regex

2017-06-21T21:06:20Z

Since c9d961647 (i18n: add--interactive: mark edit_hunk_manually message for translation, 2016-12-14), when the user asks to edit a hunk manually, we respect core.commentChar in generating the edit instructions. However, when we then strip out comment lines, we use a simple regex like: /^$commentChar/ If your chosen comment character is a regex metacharacter, then that will behave in a confusing manner ("$", for instance, would only eliminate blank lines, not actual comment lines). We can fix that by telling perl not to respect metacharacters. Reported-by: Christian Rösch Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

add--interactive: handle EOF in prompt_yesno

2017-06-21T21:06:09Z

The prompt_yesno function loops indefinitely waiting for a "y" or "n" response. But it doesn't handle EOF, meaning that we can end up in an infinite loop of reading EOF from stdin. One way to simulate that is with: echo e | GIT_EDITOR='echo corrupt >' git add -p Let's break out of the loop and propagate the undef to the caller. Without modifying the callers that effectively turns it into a "no" response. This is reasonable for both of the current callers, and it leaves room for any future caller to check for undef explicitly. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

add--interactive: drop diff.indentHeuristic handling

2017-05-09T03:24:35Z

Now that diff.indentHeuristic is handled automatically by the plumbing commands, there's no need to propagate it manually. Signed-off-by: Jeff King Signed-off-by: Marc Branchaud Signed-off-by: Junio C Hamano

Merge branch 'va/i18n-perl-scripts'

2017-04-20T04:37:17Z

Message fix. * va/i18n-perl-scripts: git-add--interactive.perl: add missing dot in a message

git-add--interactive.perl: add missing dot in a message

2017-04-14T01:01:15Z

One message appears twice in the translations and the only difference is a dot at the end. So add this dot to make the messages being identical. Signed-off-by: Ralf Thielow Signed-off-by: Junio C Hamano

Merge branch 'jk/add-i-use-pathspecs'

2017-03-17T20:50:26Z

"git add -p " unnecessarily expanded the pathspec to a list of individual files that matches the pathspec by running "git ls-files ", before feeding it to "git diff-index" to see which paths have changes, because historically the pathspec language supported by "diff-index" was weaker. These days they are equivalent and there is no reason to internally expand it. This helps both performance and avoids command line argument limit on some platforms. * jk/add-i-use-pathspecs: add--interactive: do not expand pathspecs with ls-files