git/add-patch.c, branch v2.34.2

*.c static functions: add missing attribute((format))

2021-07-13T22:20:20Z

Add missing __attribute__((format)) function attributes to various "static" functions that take printf arguments. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

Merge branch 'js/add-i-color-fix'

2020-12-08T23:11:17Z

"git add -i" failed to honor custom colors configured to show patches, which has been corrected. * js/add-i-color-fix: add -i: verify in the tests that colors can be overridden add -p: prefer color.diff.context over color.diff.plain add -i (Perl version): color header to match the C version add -i (built-in): use the same indentation as the Perl version add -p (built-in): do not color the progress indicator separately add -i (built-in): use correct names to load color.diff.* config add -i (built-in): prevent the `reset` "color" from being configured add -i: use `reset_color` consistently add -p (built-in): imitate `xdl_format_hunk_hdr()` generating hunk headers add -i (built-in): send error messages to stderr add -i (built-in): do show an error message for incorrect inputs

add -p (built-in): do not color the progress indicator separately

2020-11-16T23:59:02Z

The Perl version of this command colors the progress indicator and the prompt message in one go. Let's do the same in the built-in version so that the same upcoming test (which will compare the output of `git add -p` against a known-good version) will pass both for the Perl version as well as for the built-in version. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

add -i: use `reset_color` consistently

2020-11-11T17:07:52Z

We already maintain a list of colors in the `add_i_state`, therefore we should use them. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

add -p (built-in): imitate `xdl_format_hunk_hdr()` generating hunk headers

2020-11-11T17:07:52Z

In libxdiff, imitating GNU diff, the hunk headers only show the line count if it is different from 1. When splitting hunks, the Perl version of `git add -p` already imitates this. Let's do the same in the built-in version of said command. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'dl/checkout-p-merge-base'

2020-10-27T22:09:51Z

"git checkout -p A...B [-- ]" did not work, even though the same command without "-p" correctly used the merge-base between commits A and B. * dl/checkout-p-merge-base: t2016: add a NEEDSWORK about the PERL prerequisite add-patch: add NEEDSWORK about comparing commits Doc: document "A...B" form for in checkout and switch builtin/checkout: fix `git checkout -p HEAD...` bug

add-patch: add NEEDSWORK about comparing commits

2020-10-07T16:49:06Z

The two versions of add-patch has special-casing for the literal revision "HEAD". However, we want to handle other ways of saying "HEAD" in the same way.[0] Add a NEEDSWORK to the add-patch code that does this so that it can be addressed later. [0]: https://lore.kernel.org/git/xmqqsgat7ttf.fsf@gitster.c.googlers.com/ Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano

Merge branch 'pw/add-p-edit-ita-path'

2020-09-22T19:36:28Z

"add -p" now allows editing paths that were only added in intent. * pw/add-p-edit-ita-path: add -p: fix editing of intent-to-add paths

Merge branch 'jk/add-i-fixes'

2020-09-19T00:58:04Z

"add -i/-p" fixes. * jk/add-i-fixes: add--interactive.perl: specify --no-color explicitly add-patch: fix inverted return code of repo_read_index()

Merge branch 'pw/add-p-leakfix'

2020-09-19T00:58:03Z

Leakfix. * pw/add-p-leakfix: add -p: fix memory leak