git

git:next

Last commit made on 2019-12-06
Get this branch:
git clone -b next https://git.launchpad.net/git

Branch merges

Branch information

Name:
next
Repository:
lp:git

Recent commits

e052231... by Junio C Hamano <email address hidden> on 2019-12-06

Merge branch 'rs/xdiff-ignore-ws-w-func-context' into next

The "diff" machinery learned not to lose added/removed blank lines
in the context when --ignore-blank-lines and --function-context are
used at the same time.

* rs/xdiff-ignore-ws-w-func-context:
  xdiff: unignore changes in function context

2d72b8c... by Junio C Hamano <email address hidden> on 2019-12-06

Merge branch 'dl/rebase-with-autobase' into next

"git rebase" did not work well when format.useAutoBase
configuration variable is set, which has been corrected.

* dl/rebase-with-autobase:
  rebase: fix format.useAutoBase breakage
  format-patch: teach --no-base
  t4014: use test_config()
  format-patch: fix indentation
  t3400: demonstrate failure with format.useAutoBase

9129e71... by Junio C Hamano <email address hidden> on 2019-12-06

Merge branch 'dl/test-cleanup' into next

Test cleanup.

* dl/test-cleanup: (26 commits)
  t7700: stop losing return codes of git commands
  t7700: make references to SHA-1 generic
  t7700: replace egrep with grep
  t7700: consolidate code into test_has_duplicate_object()
  t7700: consolidate code into test_no_missing_in_packs()
  t7700: s/test -f/test_path_is_file/
  t7700: move keywords onto their own line
  t7700: remove spaces after redirect operators
  t7700: drop redirections to /dev/null
  t7501: stop losing return codes of git commands
  t7501: remove spaces after redirect operators
  t5703: stop losing return codes of git commands
  t5703: simplify one-time-sed generation logic
  t5317: use ! grep to check for no matching lines
  t5317: stop losing return codes of git commands
  t4138: stop losing return codes of git commands
  t4015: use test_write_lines()
  t4015: stop losing return codes of git commands
  t3600: comment on inducing SIGPIPE in `git rm`
  t3600: stop losing return codes of git commands
  ...

f85fac6... by Junio C Hamano <email address hidden> on 2019-12-05

Sync with master

* master:
  The third batch

c87e168... by Junio C Hamano <email address hidden> on 2019-12-05

Merge branch 'dl/lore-is-the-archive' into next

Publicize lore.kernel.org mailing list archive and use URLs
pointing into it to refer to notable messages in the documentation.

* dl/lore-is-the-archive:
  doc: replace LKML link with lore.kernel.org
  RelNotes: replace Gmane with real Message-IDs
  doc: replace MARC links with lore.kernel.org

923a6a7... by Junio C Hamano <email address hidden> on 2019-12-05

Merge branch 'ag/sequencer-continue-leakfix' into next

Leakfix.

* ag/sequencer-continue-leakfix:
  sequencer: fix a memory leak in sequencer_continue()

d0c91f4... by Junio C Hamano <email address hidden> on 2019-12-05

Merge branch 'dd/time-reentrancy' into next

Avoid gmtime() and localtime() and prefer their reentrant
counterparts.

* dd/time-reentrancy:
  mingw: use {gm,local}time_s as backend for {gm,local}time_r
  archive-zip.c: switch to reentrant localtime_r
  date.c: switch to reentrant {gm,local}time_r

85c7940... by Junio C Hamano <email address hidden> on 2019-12-05

Merge branch 'em/test-skip-regex-illseq' into next

Test portability fix.

* em/test-skip-regex-illseq:
  t4210: skip i18n tests that don't work on FreeBSD

35fc8e8... by Junio C Hamano <email address hidden> on 2019-12-05

Merge branch 'hi/gpg-use-check-signature' into next

Hide lower-level verify_signed-buffer() API as a pure helper to
implement the public check_signature() function, in order to
encourage new callers to use the correct and more strict
validation.

* hi/gpg-use-check-signature:
  gpg-interface: prefer check_signature() for GPG verification

d0ce4bc... by Junio C Hamano <email address hidden> on 2019-12-05

Merge branch 'bc/t9001-zsh-in-posix-emulation-mode' into next

Test portability fix.

* bc/t9001-zsh-in-posix-emulation-mode:
  t9001: avoid including non-trailing NUL bytes in variables