vcswatch reports that
this package seems to have new commits in its VCS but has
not yet updated debian/changelog. You should consider updating
the Debian changelog and uploading this new version into the archive.
Here are the relevant commit logs:
commit a7c7eb93cde0128a8fe89a1840e6697d5bd698e9
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed Jun 19 16:09:38 2019 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit b89466e63c531e8520c4cddec5251748f3b96f3b
Merge: 34213d3f3c 172b71a6c5
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed Jun 19 16:06:56 2019 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
commit 172b71a6c5b95846749746f7d63238d5f702bb00
Merge: d03e0c960f a6a95cd1b4
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 18:34:57 2019 -0700
Sync with master
* master:
The second batch
commit a6a95cd1b46e48e5fe06bdbb0839a67ebeef4682
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 10:16:10 2019 -0700
The second batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 14f49b2058e6757b09eae362e5061e74dcfc666e
Merge: dedc046421 1c4a9f9114
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 10:15:20 2019 -0700
Merge branch 'xl/record-partial-clone-origin'
When creating a partial clone, the object filtering criteria is
recorded for the origin of the clone, but this incorrectly used a
hardcoded name "origin" to name that remote; it has been corrected
to honor the "--origin <name>" option.
* xl/record-partial-clone-origin:
clone: respect user supplied origin name when setting up partial clone
commit dedc04642184761be54d0a861174840918e5b606
Merge: add59c4708 0454220d66
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 10:15:20 2019 -0700
Merge branch 'pb/request-pull-verify-remote-ref'
"git request-pull" learned to warn when the ref we ask them to pull
from in the local repository and in the published repository are
different.
* pb/request-pull-verify-remote-ref:
request-pull: warn if the remote object is not the same as the local one
request-pull: quote regex metacharacters in local ref
commit add59c4708cd629a6ee3175f0e0a796cc9b6db28
Merge: d4fdeed006 c3f2358de3
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 10:15:19 2019 -0700
Merge branch 'mm/p4-unshelve-windows-fix'
The command line to invoke a "git cat-file" command from inside
"git p4" was not properly quoted to protect a caret and running a
broken command on Windows, which has been corrected.
* mm/p4-unshelve-windows-fix:
p4 unshelve: fix "Not a valid object name HEAD0" on Windows
commit d4fdeed00639b27c45856dfef338d46ec60b419e
Merge: 55b34f30c2 e2dca4566d
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 10:15:19 2019 -0700
Merge branch 'po/git-help-on-git-itself'
"git help git" was hard to discover (well, at least for some
people).
* po/git-help-on-git-itself:
Doc: git.txt: remove backticks from link and add git-scm.com/docs
git.c: show usage for accessing the git(1) help page
commit 55b34f30c27c95ac3fe3c285eb9c46ed831d1565
Merge: 3dc47c4288 2656fb16dd
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 10:15:18 2019 -0700
Merge branch 'es/first-contrib-tutorial'
A new tutorial targetting specifically aspiring git-core
developers.
* es/first-contrib-tutorial:
doc: add some nit fixes to MyFirstContribution
documentation: add anchors to MyFirstContribution
documentation: add tutorial for first contribution
commit 3dc47c428894c0eca7b01561978befdc09f64e48
Merge: e7ef93ba7a 5817f9caa3
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 10:15:18 2019 -0700
Merge branch 'bb/unicode-12.1-reiwa'
Update to Unicode 12.1 width table.
* bb/unicode-12.1-reiwa:
unicode: update the width tables to Unicode 12.1
commit e7ef93ba7a6c5446b1e199841ff93a9f8e2815ff
Merge: a3e6b426b9 0108f47eb3
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 10:15:18 2019 -0700
Merge branch 'sw/git-p4-unshelve-branched-files'
"git p4" update.
* sw/git-p4-unshelve-branched-files:
git-p4: allow unshelving of branched files
commit a3e6b426b95e5a31a884101b7bea4e5d075aea06
Merge: bdc81d15a2 b5a8169752
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 10:15:17 2019 -0700
Merge branch 'js/fsmonitor-unflake'
The data collected by fsmonitor was not properly written back to
the on-disk index file, breaking t7519 tests occasionally, which
has been corrected.
* js/fsmonitor-unflake:
mark_fsmonitor_valid(): mark the index as changed if needed
fill_stat_cache_info(): prepare for an fsmonitor fix
commit bdc81d15a238c4402cc493817086a0c50dc9a508
Merge: 2f475317f2 1d8e31a3f6
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 10:15:17 2019 -0700
Merge branch 'ds/topo-traversal-using-commit-graph'
Prepare use of reachability index in topological walker that works
on a range (A..B).
* ds/topo-traversal-using-commit-graph:
revision: keep topo-walk free of unintersting commits
revision: use generation for A..B --topo-order queries
commit 2f475317f2a3f8cf3b1a4bd16445ff9fecfd30df
Merge: 94760948f1 2731a7840a
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 10:15:17 2019 -0700
Merge branch 'bl/userdiff-octave'
The pattern "git diff/grep" use to extract funcname and words
boundary for Matlab has been extend to cover Octave, which is more
or less equivalent.
* bl/userdiff-octave:
userdiff: fix grammar and style issues
userdiff: add Octave
commit 94760948f17e1902e071172677e0615da6e03d90
Merge: 6e0b1c60ad 4c6910163a
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 10:15:17 2019 -0700
Merge branch 'ba/clone-remote-submodules'
"git clone --recurse-submodules" learned to set up the submodules
to ignore commit object names recorded in the superproject gitlink
and instead use the commits that happen to be at the tip of the
remote-tracking branches from the get-go, by passing the new
"--remote-submodules" option.
* ba/clone-remote-submodules:
clone: add `--remote-submodules` flag
commit 6e0b1c60ad3e6067d5cae51a7dc36e58184accd5
Merge: 3a54d80ac8 1d14d0c994
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 10:15:17 2019 -0700
Merge branch 'vv/merge-squash-with-explicit-commit'
"git merge --squash" is designed to update the working tree and the
index without creating the commit, and this cannot be countermanded
by adding the "--commit" option; the command now refuses to work
when both options are given.
* vv/merge-squash-with-explicit-commit:
merge: refuse --commit with --squash
commit 3a54d80ac8a1decac6fa158175fb16f0563f5c15
Merge: 5b476dc2f1 3bbbe467f2
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 10:15:16 2019 -0700
Merge branch 'js/bundle-verify-require-object-store'
"git bundle verify" needs to see if prerequisite objects exist in
the receiving repository, but the command did not check if we are
in a repository upfront, which has been corrected.
* js/bundle-verify-require-object-store:
bundle verify: error out if called without an object database
commit 5b476dc2f13324852d0dbf7f2e5c020d1064ac8c
Merge: 9b3897ab06 7877ac3d7b
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 10:15:16 2019 -0700
Merge branch 'js/bisect-helper-check-get-oid-return-value'
Code cleanup.
* js/bisect-helper-check-get-oid-return-value:
bisect--helper: verify HEAD could be parsed before continuing
commit 9b3897ab0620261585831e356168b56759849481
Merge: 86d87307c1 7663e438c5
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 10:15:15 2019 -0700
Merge branch 'jk/am-i-resolved-fix'
"git am -i --resolved" segfaulted after trying to see a commit as
if it were a tree, which has been corrected.
* jk/am-i-resolved-fix:
am: fix --interactive HEAD tree resolution
am: drop tty requirement for --interactive
am: read interactive input from stdin
am: simplify prompt response handling
commit 86d87307c1c490282749e278380b9a258de0b46c
Merge: 63b6b4b7e1 533e088250
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 10:15:15 2019 -0700
Merge branch 'jk/HEAD-symref-in-xfer-namespaces'
The server side support for "git fetch" used to show incorrect
value for the HEAD symbolic ref when the namespace feature is in
use, which has been corrected.
* jk/HEAD-symref-in-xfer-namespaces:
upload-pack: strip namespace from symref data
commit 63b6b4b7e107d5b40620d0b3dc3efff0284dfb7b
Merge: ac97dc4fa9 e941c48d49
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 10:15:15 2019 -0700
Merge branch 'ew/server-info-remove-crufts'
"git update-server-info" used to leave stale packfiles in its
output, which has been corrected.
* ew/server-info-remove-crufts:
server-info: do not list unlinked packs
commit ac97dc4fa9869146f774f6df854e23afb38e15cd
Merge: 7df94cd1f6 de99eb0c24
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 10:15:14 2019 -0700
Merge branch 'es/grep-require-name-when-needed'
More parameter validation.
* es/grep-require-name-when-needed:
grep: fail if call could output and name is null
commit 7df94cd1f691dd6ccb3038e1b77544030aab3fed
Merge: 5d5c46b28c f547101b26
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 10:15:14 2019 -0700
Merge branch 'es/git-debugger-doc'
Doc update.
* es/git-debugger-doc:
doc: hint about GIT_DEBUGGER in CodingGuidelines
commit 5d5c46b28c04348f7b680e5fe007c6344a86a70a
Merge: 0aae918dd9 31f5256c82
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 17 10:15:14 2019 -0700
Merge branch 'ds/object-info-for-prefetch-fix'
Code cleanup and futureproof.
* ds/object-info-for-prefetch-fix:
sha1-file: split OBJECT_INFO_FOR_PREFETCH
commit d03e0c960ffbffc6714d0e076319c44163f03ac5
Merge: 95628af9bb 0aae918dd9
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 13 13:25:27 2019 -0700
Sync with 'master'
* master:
The first batch after 2.22
commit 0aae918dd929862d3ce0ea2960897787bb269a3b
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 13 13:23:03 2019 -0700
The first batch after 2.22
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit c51026115481834a1e0f49a2dafc1ce86025889c
Merge: 51d6c0f015 6df8df0831
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 13 13:19:43 2019 -0700
Merge branch 'pw/rebase-edit-message-for-replayed-merge'
A "merge -c" instruction during "git rebase --rebase-merges" should
give the user a chance to edit the log message, even when there is
otherwise no need to create a new merge and replace the existing
one (i.e. fast-forward instead), but did not. Which has been
corrected.
* pw/rebase-edit-message-for-replayed-merge:
rebase -r: always reword merge -c
commit 51d6c0f0159a7f8ec02bc5a095172cee857b4e3a
Merge: 2a983b227d 0f50c8e32c
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 13 13:19:43 2019 -0700
Merge branch 'ab/deprecate-R-for-dynpath'
The way of specifying the path to find dynamic libraries at runtime
has been simplified. The old default to pass -R/path/to/dir has been
replaced with the new default to pass -Wl,-rpath,/path/to/dir,
which is the more recent GCC uses. Those who need to build with an
old GCC can still use "CC_LD_DYNPATH=-R"
* ab/deprecate-R-for-dynpath:
Makefile: remove the NO_R_TO_GCC_LINKER flag
commit 2a983b227dd6df4d8db6e53e2f5be8afad061b60
Merge: 813a3a2ab7 3203566a71
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 13 13:19:43 2019 -0700
Merge branch 'mh/import-transport-fd-fix'
The ownership rule for the file descriptor to fast-import remote
backend was mixed up, leading to unrelated file descriptor getting
closed, which has been fixed.
* mh/import-transport-fd-fix:
Use xmmap_gently instead of xmmap in use_pack
dup() the input fd for fast-import used for remote helpers
commit 813a3a2ab7b29ad003fc6b8e9b3c4b9421dd36d5
Merge: 8d32d2552e f4f476b6a1
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 13 13:19:42 2019 -0700
Merge branch 'ew/update-server-info'
"git update-server-info" learned not to rewrite the file with the
same contents.
* ew/update-server-info:
update-server-info: avoid needless overwrites
commit 8d32d2552ee476917d216ae584d3d9b9002844d3
Merge: e91f65d0e2 2ed2e19958
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 13 13:19:42 2019 -0700
Merge branch 'jk/help-unknown-ref-fix'
Improve the code to show args with potential typo that cannot be
interpreted as a commit-ish.
* jk/help-unknown-ref-fix:
help_unknown_ref(): check for refname ambiguity
help_unknown_ref(): duplicate collected refnames
commit e91f65d0e28b9f4dce85f82c5e3e208a54171a14
Merge: c4a38d161c 13cdf78094
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 13 13:19:42 2019 -0700
Merge branch 'dl/format-patch-notes-config'
"git format-patch" learns a configuration to set the default for
its --notes=<ref> option.
* dl/format-patch-notes-config:
format-patch: teach format.notes config option
git-format-patch.txt: document --no-notes option
commit c4a38d161cbd3308825d7871d0f84f769aad04ab
Merge: 89d1b573d7 f3f8311ec7
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 13 13:19:41 2019 -0700
Merge branch 'nd/merge-quit'
"git merge" learned "--quit" option that cleans up the in-progress
merge while leaving the working tree and the index still in a mess.
* nd/merge-quit:
merge: add --quit
merge: remove drop_save() in favor of remove_merge_branch_state()
commit 89d1b573d73e7c93f2190a08ed9430f42104c10b
Merge: 000bce0ee4 dfe1a17df9
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 13 13:19:41 2019 -0700
Merge branch 'ab/fail-prereqs-in-test'
Developer support to emulate unsatisfied prerequisites in tests to
ensure that the remainer of the tests still succeeds when tests
with prerequisites are skipped.
* ab/fail-prereqs-in-test:
tests: add a special setup where prerequisites fail
commit 000bce0ee4d0ef719b84fb643c45fe68fa4bb773
Merge: ed7f8acbaa 105df73e71
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 13 13:19:41 2019 -0700
Merge branch 'nd/corrupt-worktrees'
"git worktree add" used to fail when another worktree connected to
the same repository was corrupt, which has been corrected.
* nd/corrupt-worktrees:
worktree add: be tolerant of corrupt worktrees
commit ed7f8acbaa3d986a8b4e8d625b2f54355ce15ef0
Merge: 0d107b1989 082ef75b7b
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 13 13:19:40 2019 -0700
Merge branch 'js/rebase-cleanup'
Update supporting parts of "git rebase" to remove code that should
no longer be used.
* js/rebase-cleanup:
rebase: fold git-rebase--common into the -p backend
sequencer: the `am` and `rebase--interactive` scripts are gone
.gitignore: there is no longer a built-in `git-rebase--interactive`
t3400: stop referring to the scripted rebase
Drop unused git-rebase--am.sh
commit 0d107b19890db191c9281bff67180389fb53df24
Merge: 66dc7b68e4 1de16aecf5
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 13 13:19:40 2019 -0700
Merge branch 'nd/worktree-name-sanitization'
In recent versions of Git, per-worktree refs are exposed in
refs/worktrees/<wtname>/ hierarchy, which means that worktree names
must be a valid refname component. The code now sanitizes the names
given to worktrees, to make sure these refs are well-formed.
* nd/worktree-name-sanitization:
worktree add: sanitize worktree names
commit 66dc7b68e4a332c662980b0266b9a1cb545f40ff
Merge: c0e78f7e46 e80001f8fd
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 13 13:19:39 2019 -0700
Merge branch 'en/fast-export-encoding'
The "git fast-export/import" pair has been taught to handle commits
with log messages in encoding other than UTF-8 better.
* en/fast-export-encoding:
fast-export: do automatic reencoding of commit messages only if requested
fast-export: differentiate between explicitly UTF-8 and implicitly UTF-8
fast-export: avoid stripping encoding header if we cannot reencode
fast-import: support 'encoding' commit header
t9350: fix encoding test to actually test reencoding
commit c0e78f7e4687e7bd5ff0b83974b28c1cc81c5487
Merge: 8202d12fca 837303700a
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 13 13:19:34 2019 -0700
Merge branch 'jk/unused-params-final-batch'
* jk/unused-params-final-batch:
verify-commit: simplify parameters to run_gpg_verify()
show-branch: drop unused parameter from show_independent()
rev-list: drop unused void pointer from finish_commit()
remove_all_fetch_refspecs(): drop unused "remote" parameter
receive-pack: drop unused "commands" from prepare_shallow_update()
pack-objects: drop unused rev_info parameters
name-rev: drop unused parameters from is_better_name()
mktree: drop unused length parameter
wt-status: drop unused status parameter
read-cache: drop unused parameter from threaded load
clone: drop dest parameter from copy_alternates()
submodule: drop unused prefix parameter from some functions
builtin: consistently pass cmd_* prefix to parse_options
cmd_{read,write}_tree: rename "unused" variable that is used
commit 8202d12fca5d482640a51c663d4d556c46dbc6b8
Merge: cf3269fba8 a8f6855f48
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 13 13:18:46 2019 -0700
Merge branch 'sb/format-patch-base-patch-id-fix'
The "--base" option of "format-patch" computed the patch-ids for
prerequisite patches in an unstable way, which has been updated to
compute in a way that is compatible with "git patch-id --stable".
* sb/format-patch-base-patch-id-fix:
format-patch: make --base patch-id output stable
format-patch: inform user that patch-id generation is unstable
commit cf3269fba816d9b216b8b0d6e95ca6a345158de5
Merge: 86d2271f06 e1df7fe43f
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 13 13:18:46 2019 -0700
Merge branch 'nd/init-relative-template-fix'
A relative pathname given to "git init --template=<path> <repo>"
ought to be relative to the directory "git init" gets invoked in,
but it instead was made relative to the repository, which has been
corrected.
* nd/init-relative-template-fix:
init: make --template path relative to $CWD
commit 86d2271f06382ceeb66e891eff87166d858270e1
Merge: b697d92f56 3ff15040e2
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 13 13:18:46 2019 -0700
Merge branch 'ab/send-email-transferencoding-fix'
Since "git send-email" learned to take 'auto' as the value for the
transfer-encoding, it by mistake stopped honoring the values given
to the configuration variables sendemail.transferencoding and/or
sendemail.<ident>.transferencoding. This has been corrected to
(finally) redoing the order of setting the default, reading the
configuration and command line options.
* ab/send-email-transferencoding-fix:
send-email: fix regression in sendemail.identity parsing
send-email: document --no-[to|cc|bcc]
send-email: fix broken transferEncoding tests
send-email: remove cargo-culted multi-patch pattern in tests
send-email: do defaults -> config -> getopt in that order
send-email: rename the @bcclist variable for consistency
send-email: move the read_config() function above getopts
commit 95628af9bbb1414c85a80e992c77d3eb4efd24a4
Merge: 33b88fa9e5 810e19322d
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jun 12 14:55:59 2019 -0700
Merge branch 'jt/partial-clone-missing-ref-delta-base' into next
"git fetch" into a lazy clone forgot to fetch base objects that are
necessary to complete delta in a thin packfile, which has been
corrected.
* jt/partial-clone-missing-ref-delta-base:
t5616: cover case of client having delta base
t5616: use correct flag to check object is missing
commit 33b88fa9e5ed595acd673d62e03cbf0a485ad178
Merge: d8fdbe21b5 33be7b38c2
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jun 12 14:55:58 2019 -0700
Merge branch 'ml/userdiff-rust' into next
The pattern "git diff/grep" use to extract funcname and words
boundary for Rust has been added.
* ml/userdiff-rust:
userdiff: two simplifications of patterns for rust
commit 810e19322d0165e89faf560e65de61b9cd5d63dc
Author: Jonathan Tan <jonathantanmy@google.com>
Date: Tue Jun 11 14:06:47 2019 -0700
t5616: cover case of client having delta base
When fetching into a partial clone, Git first prefetches missing
REF_DELTA bases from the promisor remote. (This feature was introduced
in [1].) But as can be seen in a recent test coverage report [2], the
case in which a REF_DELTA base is already present is not covered by
tests.
Extend the tests slightly to cover this case.
[1] 8a30a1efd1 ("index-pack: prefetch missing REF_DELTA bases",
2019-05-15).
[2] https://public-inbox.org/git/396091fc-5572-19a5-4f18-61c258590dd5@gmail.com/
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 5718c53d0ab47cc750e05d2af4a401197117c2f0
Author: Jonathan Tan <jonathantanmy@google.com>
Date: Tue Jun 11 14:06:46 2019 -0700
t5616: use correct flag to check object is missing
If we want to check whether an object is missing, the correct flag to
pass to rev-list is --ignore-missing; --exclude-promisor-objects will
exclude any object that came from the promisor remote, whether it is
present or missing. Use the correct flag.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 34213d3f3ced1c03b45d7390f6676e5a7c44a3d5
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Jun 10 09:26:21 2019 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit e3608a1dd424c14e4e35c6b164cc3ef683ee17c8
Merge: 230140323b d8fdbe21b5
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Jun 10 09:23:57 2019 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
commit d8fdbe21b56790dc30a162b0b5a1bf61e13598f4
Merge: ee3066bb65 b697d92f56
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Jun 7 10:08:01 2019 -0700
Sync with Git 2.22
commit ee3066bb6536c68f973b3c0ffaaa13f4bfda5ea3
Merge: b187c3dbfe fc7e03aace
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 6 12:11:48 2019 -0700
Merge branch 'mo/clang-format-for-each-update' into next
The list of for-each like macros used by clang-format has been
updated.
* mo/clang-format-for-each-update:
clang-format: use git grep to generate the ForEachMacros list
commit b187c3dbfe7b215bb41cf13d15e5205e608abf6f
Merge: 8579d82c0d d37dc239a4
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 6 12:11:48 2019 -0700
Merge branch 'md/url-parse-harden' into next
The URL decoding code has been updated to avoid going past the end
of the string while parsing %-<hex>-<hex> sequence.
* md/url-parse-harden:
url: do not allow %00 to represent NUL in URLs
url: do not read past end of buffer
commit 8579d82c0dec89c7a780f3211bbc48124c1ceaa9
Merge: 8e4d85b906 1a58bad014
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 6 12:11:47 2019 -0700
Merge branch 'an/ignore-doc-update' into next
The description about slashes in gitignore patterns (used to
indicate things like "anchored to this level only" and "only
matches directories") has been revamped.
* an/ignore-doc-update:
gitignore.txt: make slash-rules more readable
commit 8e4d85b906c0b211c6b2ab8d63d9f45db7a0cfaf
Merge: acf1c2fc96 afc3bf6eb1
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 6 12:11:47 2019 -0700
Merge branch 'ab/hash-object-doc' into next
Doc update.
* ab/hash-object-doc:
hash-object doc: stop mentioning git-cvsimport
commit acf1c2fc964236a2c95f96fa514a6eef490e83c5
Merge: 736f3c175b 9df8f734fd
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 6 12:11:46 2019 -0700
Merge branch 'cm/send-email-document-req-modules' into next
A doc update.
* cm/send-email-document-req-modules:
send-email: update documentation of required Perl modules
commit 736f3c175b9621bbdb9de043c966de3746979b0f
Merge: 80f0187cef 5c03bc8b1d
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 6 12:11:46 2019 -0700
Merge branch 'md/list-objects-filter-parse-msgfix' into next
Make an end-user facing message localizable.
* md/list-objects-filter-parse-msgfix:
list-objects-filter-options: error is localizeable
commit 80f0187cef7381fab18679e2261367e2e14deca1
Merge: fd59bad9d7 7140600e2e
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 6 12:11:45 2019 -0700
Merge branch 'md/list-objects-filter-memfix' into next
The filter_data used in the list-objects-filter (which manages a
lazily sparse clone repository) did not use the dynamic array API
correctly---'nr' is supposed to point at one past the last element
of the array in use. This has been corrected.
* md/list-objects-filter-memfix:
list-objects-filter: correct usage of ALLOC_GROW
commit fd59bad9d795c1d59323cc0ba0d73353ff8a83a1
Merge: 20b4646340 481de8a293
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jun 6 12:11:40 2019 -0700
Merge branch 'en/merge-directory-renames-fix' into next
Recent code restructuring of merge-recursive engine introduced a
regression dealing with rename/add conflict.
* en/merge-directory-renames-fix:
merge-recursive: restore accidentally dropped setting of path
commit fc7e03aace379c3d6b00ac977447f115421324fe
Author: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Date: Tue Jun 4 00:48:14 2019 +0200
clang-format: use git grep to generate the ForEachMacros list
The ForEachMacros list can reasonably be generated grepping
the C source code for macros with 'for_each' in their name.
Taken almost verbatim from the .clang-format file in the Linux kernel.
Signed-off-by: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit d37dc239a427a367427f9c4fdf12a148ad811968
Author: Matthew DeVore <matvore@google.com>
Date: Tue Jun 4 10:57:05 2019 -0700
url: do not allow %00 to represent NUL in URLs
There is no reason to allow %00 to terminate a string, so do not allow it.
Otherwise, we end up returning arbitrary content in the string (that which is
after the %00) which is effectively hidden from callers and can escape sanity
checks and validation, and possible be used in tandem with a security
vulnerability to introduce a payload.
Helped-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Matthew DeVore <matvore@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 3f6b8a6177f3197ddad82a6da2ff9b4704664f5d
Author: Matthew DeVore <matvore@google.com>
Date: Tue Jun 4 10:57:04 2019 -0700
url: do not read past end of buffer
url_decode_internal could have been tricked into reading past the length
of the **query buffer if there are fewer than 2 characters after a % (in
a null-terminated string, % would have to be the last character).
Prevent this from happening by checking len before decoding the %
sequence.
Helped-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Matthew DeVore <matvore@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 1a58bad0144dedd59eeef29b7ba7791aed19106f
Author: Dr. Adam Nielsen <admin@in-ici.net>
Date: Tue Jun 4 19:34:46 2019 +0200
gitignore.txt: make slash-rules more readable
Renew paragraphs relevant for pattern with slash.
Aim to make it more clear and to avoid possible
pitfalls for the reader. Add some examples.
Signed-off-by: Dr. Adam Nielsen <admin@in-ici.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 230140323b3acdd7d4d26dd32a04c2d87cf64a82
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Jun 4 11:51:12 2019 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 9884c7bd8b2a9894d846e39481f1bda4738b8fc5
Merge: 5029bc106a 20b4646340
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Jun 4 11:41:44 2019 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
commit 20b46463406ef6ca70b1a63c5e26d4e2ead8dc13
Merge: dc291fa199 74583d8912
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jun 3 11:31:31 2019 -0700
Sync with Git 2.22-rc3
* master:
Git 2.22-rc3
i18n: fix typos found during l10n for git 2.22.0
RelNotes: minor typo fixes in 2.22.0 draft
commit 5029bc106a2e48db4ac3ff47d8879a4184ee5e94
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Jun 3 11:27:37 2019 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit a67e43ea24e59966756c05cd2d4f2a1f71d94b2a
Merge: f83c15aef7 f4fbbf30c2
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Jun 3 10:58:45 2019 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
commit dc291fa1995fe4720e2f19cfef9e476f7cf69b62
Merge: 0f73300dfa 1c4a9f9114
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri May 31 15:22:06 2019 -0700
Merge branch 'xl/record-partial-clone-origin' into next
When creating a partial clone, the object filtering criteria is
recorded for the origin of the clone, but this incorrectly used a
hardcoded name "origin" to name that remote; it has been corrected
to honor the "--origin <name>" option.
* xl/record-partial-clone-origin:
clone: respect user supplied origin name when setting up partial clone
commit 0f73300dfa0cfa023fa180048ca769756dc5240b
Merge: d45167d723 0454220d66
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri May 31 15:22:06 2019 -0700
Merge branch 'pb/request-pull-verify-remote-ref' into next
"git request-pull" learned to warn when the ref we ask them to pull
from in the local repository and in the published repository are
different.
* pb/request-pull-verify-remote-ref:
request-pull: warn if the remote object is not the same as the local one
request-pull: quote regex metacharacters in local ref
commit d45167d7235b805510f33974c09299dc9540548a
Merge: 455541d73a c3f2358de3
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri May 31 15:22:06 2019 -0700
Merge branch 'mm/p4-unshelve-windows-fix' into next
The command line to invoke a "git cat-file" command from inside
"git p4" was not properly quoted to protect a caret and running a
broken command on Windows, which has been corrected.
* mm/p4-unshelve-windows-fix:
p4 unshelve: fix "Not a valid object name HEAD0" on Windows
commit 455541d73adc1e7b577915ccf9f1b2fb4df162c9
Merge: f4fbbf30c2 e2dca4566d
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri May 31 15:22:05 2019 -0700
Merge branch 'po/git-help-on-git-itself' into next
"git help git" was hard to discover (well, at least for some
people).
* po/git-help-on-git-itself:
Doc: git.txt: remove backticks from link and add git-scm.com/docs
git.c: show usage for accessing the git(1) help page
commit 9df8f734fdbf2a46cfea55a966cf2a906f9db7c2
Author: Chris Mayo <aklhfex@gmail.com>
Date: Thu May 30 19:39:10 2019 +0100
send-email: update documentation of required Perl modules
Improve and complete the list of required email related Perl modules,
clarifying which are core Perl modules and remove Net::SMTP::SSL.
git-send-email uses the TLS support in the Net::SMTP core module from
recent versions of Perl. Documenting the minimum version is complex
because of separate numbering for Perl (5.21.5~169), Net:SMTP (2.34)
and libnet (3.01). Version numbers from commit:
bfbfc9a953 ("send-email: Net::SMTP::starttls was introduced in v2.34",
2017-05-31).
Users of older Perl versions without Net::SMTP::SSL installed will get a
clear error message.
Signed-off-by: Chris Mayo <aklhfex@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 7140600e2e78f202594ebca09e3176b6fcac1625
Author: Matthew DeVore <matvore@google.com>
Date: Fri May 31 11:46:06 2019 -0700
list-objects-filter: correct usage of ALLOC_GROW
In the sparse filter data, array_frame array is used in a way such that
nr is the index of the last element. Fix this so that nr is actually the
number of elements in the array.
The filter_sparse_free function also has an unaddressed TODO to free the
memory associated with the sparse filter data. Address that TODO and fix
the memory leak.
Signed-off-by: Matthew DeVore <matvore@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 5c03bc8b1d1f992ebe43c567bb95cdb5e0273d28
Author: Matthew DeVore <matvore@google.com>
Date: Fri May 31 11:01:56 2019 -0700
list-objects-filter-options: error is localizeable
The "invalid filter-spec" message is user-facing and not a BUG, so make
it localizeable.
For reference, the message appears in this context:
$ git rev-list --filter=blob:nonse --objects HEAD
fatal: invalid filter-spec 'blob:nonse'
Signed-off-by: Matthew DeVore <matvore@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit f4fbbf30c2866bb423731899b666bc3184d8e162
Merge: 5a294203ad 874dd410ce
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu May 30 11:00:37 2019 -0700
Sync with Git 2.22-rc2
* master:
Git 2.22-rc2
commit 5a294203addcf961ec6ad3e552792638fc063d7d
Merge: 016465335c e693237e2b
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu May 30 10:10:59 2019 -0700
Merge branch 'cc/list-objects-filter-wo-sparse-path' into next
Disable "--filter=sparse:path=<path>" that would allow reading from
paths on the filesystem.
* cc/list-objects-filter-wo-sparse-path:
list-objects-filter: disable 'sparse:path' filters
commit 016465335ced8459b229d7f665b150d76c8b16b9
Merge: e1985f61fc 5817f9caa3
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu May 30 10:10:59 2019 -0700
Merge branch 'bb/unicode-12.1-reiwa' into next
Update to Unicode 12.1 width table.
* bb/unicode-12.1-reiwa:
unicode: update the width tables to Unicode 12.1
commit e1985f61fc176dba79543c1431f5dabf21109d50
Merge: 1aa850bc59 0108f47eb3
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu May 30 10:10:59 2019 -0700
Merge branch 'sw/git-p4-unshelve-branched-files' into next
"git p4" update.
* sw/git-p4-unshelve-branched-files:
git-p4: allow unshelving of branched files
commit 1aa850bc59c0d1cf0b555afcd9fa7d46769c32cb
Merge: 590527995e b5a8169752
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu May 30 10:10:58 2019 -0700
Merge branch 'js/fsmonitor-unflake' into next
The data collected by fsmonitor was not properly written back to
the on-disk index file, breaking t7519 tests occasionally, which
has been corrected.
* js/fsmonitor-unflake:
mark_fsmonitor_valid(): mark the index as changed if needed
fill_stat_cache_info(): prepare for an fsmonitor fix
commit 590527995e0b20672dba6fc60f00f2071f466836
Merge: 96317960ab 1d8e31a3f6
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu May 30 10:10:58 2019 -0700
Merge branch 'ds/topo-traversal-using-commit-graph' into next
Prepare use of reachability index in topological walker that works
on a range (A..B).
* ds/topo-traversal-using-commit-graph:
revision: keep topo-walk free of unintersting commits
revision: use generation for A..B --topo-order queries
commit 96317960abd5e17f748c9f6402e3ae77e2c0613c
Merge: 5d7573a151 2656fb16dd
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu May 30 10:10:56 2019 -0700
Merge branch 'es/first-contrib-tutorial' into next
A new tutorial targetting specifically aspiring git-core
developers.
* es/first-contrib-tutorial:
doc: add some nit fixes to MyFirstContribution
commit 33be7b38c23fbbaf75197f6150323e0d4c84bf12
Author: Johannes Sixt <j6t@kdbg.org>
Date: Thu May 30 18:44:35 2019 +0200
userdiff: two simplifications of patterns for rust
- Do not enforce (but assume) syntactic correctness of language
constructs that go into hunk headers: we only want to ensure that
the keywords actually are words and not just the initial part of
some identifier.
- In the word regex, match numbers only when they begin with a digit,
but then be liberal in what follows, assuming that the text that is
matched is syntactially correct.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 1c4a9f91142b2ca1b715e99b6e6da4016d422eb4
Author: Xin Li <delphij@google.com>
Date: Wed May 29 14:26:43 2019 -0700
clone: respect user supplied origin name when setting up partial clone
Signed-off-by: Xin Li <delphij@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 5817f9caa3ca6f4f552d8be5bbfccd1e03718f06
Author: Beat Bolli <dev+git@drbeat.li>
Date: Wed May 29 22:50:45 2019 +0200
unicode: update the width tables to Unicode 12.1
Now that Unicode 12.1 has been announced[0], update the character
width tables to the new version.
[0] http://blog.unicode.org/2019/05/unicode-12-1-en.html
Signed-off-by: Beat Bolli <dev+git@drbeat.li>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 2656fb16ddb1ea1717277bcdf981c5e8794bfb5b
Author: Emily Shaffer <emilyshaffer@google.com>
Date: Wed May 29 13:18:09 2019 -0700
doc: add some nit fixes to MyFirstContribution
A trial run-through of the tutorial revealed a few typos and missing
commands in the tutorial itself. This commit fixes typos, clarifies
which lines to keep or modify in some places, and adds a section on
putting the git-psuh binary into the gitignore.
Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit f83c15aef7cb3d773cff7d0f226bfabd7dc603f9
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed May 29 13:58:50 2019 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 711d97b015283e5034c935652bf7f38bc3aefc65
Merge: 36c8b8089e 5d7573a151
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed May 29 13:56:32 2019 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
commit 5d7573a151b918062087822a2f0d7661dc4bd707
Merge: 209baa3e55 8a30a1efd1
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed May 29 13:15:49 2019 -0700
Merge branch 'jt/partial-clone-missing-ref-delta-base' into next
"git fetch" into a lazy clone forgot to fetch base objects that are
necessary to complete delta in a thin packfile, which has been
corrected.
* jt/partial-clone-missing-ref-delta-base:
index-pack: prefetch missing REF_DELTA bases
t5616: refactor packfile replacement
commit 209baa3e5520db02dbbfb58efac82b0c24ce06b1
Merge: 71972f94c2 1d14d0c994
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed May 29 13:15:49 2019 -0700
Merge branch 'vv/merge-squash-with-explicit-commit' into next
"git merge --squash" is designed to update the working tree and the
index without creating the commit, and this cannot be countermanded
by adding the "--commit" option; the command now refuses to work
when both options are given.
* vv/merge-squash-with-explicit-commit:
merge: refuse --commit with --squash
commit 71972f94c20fbc7ae657728836d6b9f3fb9f3900
Merge: c2cfe38955 4c6910163a
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed May 29 13:15:48 2019 -0700
Merge branch 'ba/clone-remote-submodules' into next
"git clone --recurse-submodules" learned to set up the submodules
to ignore commit object names recorded in the superproject gitlink
and instead use the commits that happen to be at the tip of the
remote-tracking branches from the get-go, by passing the new
"--remote-submodules" option.
* ba/clone-remote-submodules:
clone: add `--remote-submodules` flag
commit c2cfe389556c3ea3f82b3718a625019e0104c756
Merge: 655ba18f30 533e088250
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed May 29 13:15:48 2019 -0700
Merge branch 'jk/HEAD-symref-in-xfer-namespaces' into next
The server side support for "git fetch" used to show incorrect
value for the HEAD symbolic ref when the namespace feature is in
use, which has been corrected.
* jk/HEAD-symref-in-xfer-namespaces:
upload-pack: strip namespace from symref data
commit 655ba18f30ea7accd9a4dfc03e0c49b77514c5e9
Merge: e1ec57894a e941c48d49
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed May 29 13:15:48 2019 -0700
Merge branch 'ew/server-info-remove-crufts' into next
"git update-server-info" used to leave stale packfiles in its
output, which has been corrected.
* ew/server-info-remove-crufts:
server-info: do not list unlinked packs
commit e1ec57894a147477e84dfffeab39153497fa007d
Merge: 449ba4ae6c de99eb0c24
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed May 29 13:15:47 2019 -0700
Merge branch 'es/grep-require-name-when-needed' into next
More parameter validation.
* es/grep-require-name-when-needed:
grep: fail if call could output and name is null
commit 449ba4ae6c66d80ddd158d3e87a1754e5e2d3a03
Merge: ee0055b276 f547101b26
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed May 29 13:15:47 2019 -0700
Merge branch 'es/git-debugger-doc' into next
Doc update.
* es/git-debugger-doc:
doc: hint about GIT_DEBUGGER in CodingGuidelines
commit ee0055b276a174df3bcef91e286a5cdb5b738c19
Merge: 695bb51514 31f5256c82
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed May 29 13:15:47 2019 -0700
Merge branch 'ds/object-info-for-prefetch-fix' into next
Code cleanup.
* ds/object-info-for-prefetch-fix:
sha1-file: split OBJECT_INFO_FOR_PREFETCH
commit 695bb5151441b4e5050109612ec4ee6900a2c85a
Merge: 77de6e31b6 8e9fe16c87
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed May 29 13:15:46 2019 -0700
Merge branch 'es/doc-gitsubmodules-markup' into next
Doc markup fix.
* es/doc-gitsubmodules-markup:
gitsubmodules: align html and nroff lists
commit 77de6e31b61b5110498843c4bfadcf4915409a02
Merge: 747fbbaf11 4c785c0edc
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed May 29 13:15:46 2019 -0700
Merge branch 'js/rebase-config-bitfix' into next
* js/rebase-config-bitfix:
rebase: replace incorrect logical negation by correct bitwise one
commit 747fbbaf11c4140dd2978c8db385b95631cadb77
Merge: 24125b3bc0 3bbbe467f2
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed May 29 13:15:46 2019 -0700
Merge branch 'js/bundle-verify-require-object-store' into next
"git bundle verify" needs to see if prerequisite objects exist in
the receiving repository, but the command did not check if we are
in a repository upfront, which has been corrected.
* js/bundle-verify-require-object-store:
bundle verify: error out if called without an object database
commit 24125b3bc0b45162412d2b0de2440bb14c521c87
Merge: e711103b1a 7877ac3d7b
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed May 29 13:15:45 2019 -0700
Merge branch 'js/bisect-helper-check-get-oid-return-value' into next
Code cleanup.
* js/bisect-helper-check-get-oid-return-value:
bisect--helper: verify HEAD could be parsed before continuing
commit e711103b1acd451cdde539868c7279ed2f0f25b1
Merge: c8a99d18c0 7663e438c5
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed May 29 13:15:45 2019 -0700
Merge branch 'jk/am-i-resolved-fix' into next
"git am -i --resolved" segfaulted after trying to see a commit as
if it were a tree, which has been corrected.
* jk/am-i-resolved-fix:
am: fix --interactive HEAD tree resolution
am: drop tty requirement for --interactive
am: read interactive input from stdin
am: simplify prompt response handling
commit c8a99d18c06de0f4f3e6a0377d484309f26295ae
Merge: 30eb487077 3ff15040e2
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed May 29 13:15:43 2019 -0700
Merge branch 'ab/send-email-transferencoding-fix' into next
Since "git send-email" learned to take 'auto' as the value for the
transfer-encoding, it by mistake stopped honoring the values given
to the configuration variables sendemail.transferencoding and/or
sendemail.<ident>.transferencoding. This has been corrected to
(finally) redoing the order of setting the default, reading the
configuration and command line options.
* ab/send-email-transferencoding-fix:
send-email: fix regression in sendemail.identity parsing
send-email: document --no-[to|cc|bcc]
send-email: fix broken transferEncoding tests
send-email: remove cargo-culted multi-patch pattern in tests
![[bug history graph]](https://qa.debian.org/data/bts/graphs/g/git.png){kind=link}