git

git:maint

Last commit made on 2021-11-24
Get this branch:
git clone -b maint https://git.launchpad.net/git

Branch merges

Branch information

Name:
maint
Repository:
lp:git

Recent commits

e9d7761... by Junio C Hamano <email address hidden>

Git 2.34.1

Signed-off-by: Junio C Hamano <email address hidden>

d62a765... by Junio C Hamano <email address hidden>

Merge branch 'jc/save-restore-terminal-revert' into maint

Regression fix for 2.34

* jc/save-restore-terminal-revert:
  Revert "editor: save and reset terminal after calling EDITOR"

eef0a8e... by Junio C Hamano <email address hidden>

Merge branch 'ds/add-rm-with-sparse-index' into maint

Regression fix for 2.34

* ds/add-rm-with-sparse-index:
  dir: revert "dir: select directories correctly"

bcef4ba... by Junio C Hamano <email address hidden>

Merge branch 'ab/update-submitting-patches' into maint

Doc fix.

* ab/update-submitting-patches:
  SubmittingPatches: fix Asciidoc syntax in "GitHub CI" section

ad03180... by Junio C Hamano <email address hidden>

Merge branch 'ev/pull-already-up-to-date-is-noop' into maint

"git pull" with any strategy when the other side is behind us
should succeed as it is a no-op, but doesn't.

* ev/pull-already-up-to-date-is-noop:
  pull: should be noop when already-up-to-date

a650ff5... by Junio C Hamano <email address hidden>

Merge branch 'hm/paint-hits-in-log-grep' into maint

"git grep" looking in a blob that has non-UTF8 payload was
completely broken when linked with versions of PCREv2 library older
than 10.34 in the latest release.

* hm/paint-hits-in-log-grep:
  Revert "grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data"

e3f7e01... by Junio C Hamano <email address hidden>

Revert "editor: save and reset terminal after calling EDITOR"

This reverts commit 3d411afabc9a96f41d47c07d6af6edda3d29ec92,
blindly opening /dev/tty and calling tcsetattr() seems to be causing
problems.

cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=577358
cf. https://<email address hidden>/

Signed-off-by: Junio C Hamano <email address hidden>

33c5d6c... by Derrick Stolee <email address hidden>

dir: revert "dir: select directories correctly"

This reverts commit f6526728f950cacfd5b5e42bcc65f2c47f3da654.

The change in f652672 (dir: select directories correctly, 2021-09-24)
caused a regression in directory-based matches with non-cone-mode
patterns, especially for .gitignore patterns. A test is included to
prevent this regression in the future.

The commit ed495847 (dir: fix pattern matching on dirs, 2021-09-24) was
reverted in 5ceb663 (dir: fix directory-matching bug, 2021-11-02) for
similar reasons. Neither commit changed tests, and tests added later in
the series continue to pass when these commits are reverted.

Reported-by: Danial Alihosseini <email address hidden>
Signed-off-by: Derrick Stolee <email address hidden>
Signed-off-by: Junio C Hamano <email address hidden>

e7f3925... by Junio C Hamano <email address hidden>

Revert "grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data"

This reverts commit ae39ba431ab861548eb60b4bd2e1d8b8813db76f, as it
breaks "grep" when looking for a string in non UTF-8 haystack, when
linked with certain versions of PCREv2 library.

Signed-off-by: Junio C Hamano <email address hidden>

ea1954a... by Erwin Villejo <email address hidden>

pull: should be noop when already-up-to-date

The already-up-to-date pull bug was fixed for --ff-only but it did not
include the case where --ff or --ff-only are not specified. This updates
the --ff-only fix to include the case where --ff or --ff-only are not
specified in command line flags or config.

Signed-off-by: Erwin Villejo <email address hidden>
Signed-off-by: Junio C Hamano <email address hidden>