git, branch v2.29.2

Git 2.29.2

2020-10-29T21:24:09Z

Signed-off-by: Junio C Hamano

Merge branch 'cc/doc-filter-branch-typofix' into maint

2020-10-29T21:18:49Z

Docfix. * cc/doc-filter-branch-typofix: filter-branch doc: fix filter-repo typo

Merge branch 'jk/committer-date-is-author-date-fix' into maint

2020-10-29T21:18:47Z

In 2.29, "--committer-date-is-author-date" option of "rebase" and "am" subcommands lost the e-mail address by mistake, which has been corrected. * jk/committer-date-is-author-date-fix: rebase: fix broken email with --committer-date-is-author-date am: fix broken email with --committer-date-is-author-date t3436: check --committer-date-is-author-date result more carefully

rebase: fix broken email with --committer-date-is-author-date

2020-10-23T15:25:22Z

Commit 7573cec52c (rebase -i: support --committer-date-is-author-date, 2020-08-17) copied the committer ident-parsing code from builtin/am.c. And in doing so, it copied a bug in which we always set the email to an empty string. We fixed the version in git-am in the previous commit; this commit fixes the copied code. Reported-by: VenomVendor Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

am: fix broken email with --committer-date-is-author-date

2020-10-23T15:25:19Z

Commit e8cbe2118a (am: stop exporting GIT_COMMITTER_DATE, 2020-08-17) rewrote the code for setting the committer date to use fmt_ident(), rather than setting an environment variable and letting commit_tree() handle it. But it introduced two bugs: - we use the author email string instead of the committer email - when parsing the committer ident, we used the wrong variable to compute the length of the email, resulting in it always being a zero-length string This commit fixes both, which causes our test of this option via the rebase "apply" backend to now succeed. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

t3436: check --committer-date-is-author-date result more carefully

2020-10-23T15:25:17Z

After running "rebase --committer-date-is-author-date", we confirm that the committer date is the same as the author date. However, we don't look at any other parts of the committer ident line to make sure we didn't screw them up. And indeed, there are a few bugs here. Depending on the rebase backend in use, we may accidentally use the author email instead of the committer's, or even an empty string. Let's teach our test_ctime_is_atime helper to check the committer name and email, which reveals several failing tests. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Git 2.29.1

2020-10-22T22:07:25Z

Signed-off-by: Junio C Hamano

Merge branch 'js/no-builtins-on-disk-option' into maint

2020-10-22T22:01:22Z

Brown-paper-bag fix. * js/no-builtins-on-disk-option: SKIP_DASHED_BUILT_INS: do not skip the bin/ programs

SKIP_DASHED_BUILT_INS: do not skip the bin/ programs

2020-10-21T19:56:40Z

The idea of the `SKIP_DASHED_BUILT_INS` option is to stop hard-linking the built-in commands as separate executables. The patches to do that specifically excluded the three commands `receive-pack`, `upload-archive` and `upload-pack`, though: these commands are expected to be present in the `PATH` in their dashed form on the server side of any fetch/push. However, due to an oversight by myself, even if those commands were still hard-linked, they were not installed into `bin/`. Noticed-by: Michael Forney Signed-off-by: Johannes Schindelin Reviewed-by: Taylor Blau Signed-off-by: Junio C Hamano

filter-branch doc: fix filter-repo typo

2020-10-20T19:22:25Z

The name of the tool is 'git-filter-repo' not 'git-repo-filter'. Signed-off-by: Christian Couder Reviewed-by: Elijah Newren Signed-off-by: Junio C Hamano