vcswatch reports that
this package seems to have a new changelog entry (version
1:2.24.1+next.20191210-0.1, distribution
experimental) and new commits
in its VCS. You should consider whether it's time to make
an upload.
Here are the relevant commit messages:
commit 5be150c3c90799cf3bf5c02b8bc2d4414a5dc5b6
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Dec 10 15:58:28 2019 -0800
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit e567e2743c3b8f010ff47520888353b9d717aebb
Merge: 71b48fdafd 03f4e72817
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Dec 10 15:56:46 2019 -0800
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
commit 03f4e7281782186d78ced899a691b48206e47fcf
Merge: 3a705a40d6 ad05a3d8e5
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 14:42:29 2019 -0800
Sync with master
commit ad05a3d8e5a6a06443836b5e40434262d992889a
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:53:00 2019 -0800
The fifth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 3a705a40d6653f5b05dfa85c5fb1b1524933943b
Merge: 75ae310f9a 8cf8f9b4aa
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:57:26 2019 -0800
Merge branch 'js/t3404-indent-fix' into next
Test cleanup.
* js/t3404-indent-fix:
t3404: fix indentation
commit 75ae310f9a2a366cf50b003d5f1549727a1aeaf7
Merge: cf403a83da 6c51cb525d
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:57:15 2019 -0800
Merge branch 'hw/doc-in-header' into next
* hw/doc-in-header:
trace2: move doc to trace2.h
submodule-config: move doc to submodule-config.h
tree-walk: move doc to tree-walk.h
trace: move doc to trace.h
run-command: move doc to run-command.h
parse-options: add link to doc file in parse-options.h
credential: move doc to credential.h
argv-array: move doc to argv-array.h
cache: move doc to cache.h
sigchain: move doc to sigchain.h
pathspec: move doc to pathspec.h
revision: move doc to revision.h
attr: move doc to attr.h
refs: move doc to refs.h
remote: move doc to remote.h and refspec.h
sha1-array: move doc to sha1-array.h
merge: move doc to ll-merge.h
graph: move doc to graph.h and graph.c
dir: move doc to dir.h
diff: move doc to diff.h and diffcore.h
commit cf403a83da50a2a4903e23cb16b6cc15b2708bfe
Merge: 591b24162c 4507ecc771
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:57:00 2019 -0800
Merge branch 'rs/patch-id-use-oid-to-hex' into next
Code cleanup.
* rs/patch-id-use-oid-to-hex:
patch-id: use oid_to_hex() to print multiple object IDs
commit 591b24162cfd0c033a788df229ddd9eb97c1916e
Merge: 5a0b530805 147ee35558
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:57:00 2019 -0800
Merge branch 'rs/commit-export-env-simplify' into next
Code cleanup.
* rs/commit-export-env-simplify:
commit: use strbuf_add() to add a length-limited string
commit 5a0b53080562175c97c04edd7fbf3bf1ff0ea73b
Merge: ad8a629fc6 e05e8cf074
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:56:59 2019 -0800
Merge branch 'rs/archive-zip-code-cleanup' into next
Code cleanup.
* rs/archive-zip-code-cleanup:
archive-zip: use enum for compression method
commit ad8a629fc6314dd4c0c4f26dd06203a56191e7fc
Merge: 2d8830090f 11de8dd7ef
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:56:59 2019 -0800
Merge branch 'dr/branch-usage-casefix' into next
Message fix.
* dr/branch-usage-casefix:
l10n: minor case fix in 'git branch' '--unset-upstream' description
commit 2d8830090ff36bdefa80704b7014f22237b34293
Merge: dee7a9a945 09ac67a183
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:56:59 2019 -0800
Merge branch 'dl/format-patch-notes-config-fixup' into next
"git format-patch" can take a set of configured format.notes values
to specify which notes refs to use in the log message part of the
output. The behaviour of this was not consistent with multiple
--notes command line options, which has been corrected.
* dl/format-patch-notes-config-fixup:
format-patch: move git_config() before repo_init_revisions()
format-patch: use --notes behavior for format.notes
notes: extract logic into set_display_notes()
notes: create init_display_notes() helper
notes: rename to load_display_notes()
commit dee7a9a945284dad661115b669e4fdb09d86154a
Merge: d7ffb75a43 0d9b0d7885
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:56:58 2019 -0800
Merge branch 'sg/t9300-robustify' into next
The test on "fast-import" used to get stuck when "fast-import" died
in the middle.
* sg/t9300-robustify:
t9300-fast-import: don't hang if background fast-import exits too early
t9300-fast-import: store the PID in a variable instead of pidfile
commit d7ffb75a4354d3bfdc9a7dbd488aef4eefe7fa65
Merge: af8f441807 b4bbbbd5a2
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:56:58 2019 -0800
Merge branch 'js/add-i-a-bit-more-tests' into next
Test coverage update in preparation for further work on "git add -i".
* js/add-i-a-bit-more-tests:
apply --allow-overlap: fix a corner case
git add -p: use non-zero exit code when the diff generation failed
t3701: verify that the diff.algorithm config setting is handled
t3701: verify the shown messages when nothing can be added
t3701: add a test for the different `add -p` prompts
t3701: avoid depending on the TTY prerequisite
t3701: add a test for advanced split-hunk editing
commit af8f4418075519830dc48c4a9afd355e90e2ff1f
Merge: 6b018bd997 abcf857300
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:56:58 2019 -0800
Merge branch 'dl/range-diff-with-notes' into next
Code clean-up.
* dl/range-diff-with-notes:
range-diff: clear `other_arg` at end of function
range-diff: mark pointers as const
t3206: fix incorrect test name
commit 6b018bd9979db95ad59ea2ed00d986589b4b06f3
Merge: 99f4b37f93 a9aecc7abb
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:56:58 2019 -0800
Merge branch 'am/pathspec-f-f-checkout' into next
A few more commands learned the "--pathspec-from-file" command line
option.
* am/pathspec-f-f-checkout:
checkout, restore: support the --pathspec-from-file option
doc: restore: synchronize <pathspec> description
doc: checkout: synchronize <pathspec> description
doc: checkout: fix broken text reference
doc: checkout: remove duplicate synopsis
add: support the --pathspec-from-file option
cmd_add: prepare for next patch
commit 71b48fdafd0fa76a0d0ee50793cd164030285f55
Merge: b88ab53500 acd6911eb8
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Dec 10 13:24:58 2019 -0800
Merge branch 'debian-sid' into debian-experimental
* debian-sid:
debian: use upstream tarball for 2.24.1
debian: apply security fixes from 2.24.1
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit acd6911eb84949d44a25c380d0b30040d3a267f4
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Dec 10 13:22:13 2019 -0800
debian: use upstream tarball for 2.24.1
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit a69ee25626ebfaca4088bea60455754eb964247c
Merge: 7659aa7108 53a06cf39b
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Dec 10 13:18:26 2019 -0800
Merge tag 'v2.24.1' into debian-sid
Git 2.24.1
commit b88ab53500dd075c647c785eb9a89c92f82e4d0f
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Dec 10 13:18:00 2019 -0800
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit cfdc91510e9e4c3e46037c86293f6e22a59ef50b
Merge: efe1348141 99f4b37f93
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Dec 10 13:14:41 2019 -0800
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
commit 7cc5f890882214c12c08067404321043fb93e048
Merge: b089e5e6cb f6b9413baf
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:11:46 2019 -0800
Merge branch 'ag/sequencer-continue-leakfix'
Leakfix.
* ag/sequencer-continue-leakfix:
sequencer: fix a memory leak in sequencer_continue()
commit b089e5e6cb30a40bd115c2b421552873ebd67c47
Merge: 930078ba39 7187c7bbb8
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:11:45 2019 -0800
Merge branch 'em/test-skip-regex-illseq'
Test portability fix.
* em/test-skip-regex-illseq:
t4210: skip i18n tests that don't work on FreeBSD
commit 930078ba3995216193a18cf67ddfdc198e892fd5
Merge: 08d2f46d0c 72b006f4bf
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:11:45 2019 -0800
Merge branch 'hi/gpg-use-check-signature'
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
commit 08d2f46d0caf4125ef8f416b7bdc38af62233fb6
Merge: 7aba2b7fd6 c64368e3a2
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:11:45 2019 -0800
Merge branch 'bc/t9001-zsh-in-posix-emulation-mode'
Test portability fix.
* bc/t9001-zsh-in-posix-emulation-mode:
t9001: avoid including non-trailing NUL bytes in variables
commit 7aba2b7fd6afa858f44cdba7c7f19da75de9b9be
Merge: 55c37d12d3 fc42f20e24
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:11:44 2019 -0800
Merge branch 'sg/test-squelch-noise-in-commit-bulk'
Code cleanup.
* sg/test-squelch-noise-in-commit-bulk:
test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk'
commit 55c37d12d3b105856cb8085c5d7e26bed313e863
Merge: 41dac79c2f 528d9e6d01
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:11:44 2019 -0800
Merge branch 'jk/perf-wo-git-dot-pm'
Test cleanup.
* jk/perf-wo-git-dot-pm:
t/perf: don't depend on Git.pm
commit 41dac79c2f49f9ea1c808f0f208bde9aa4ed91cb
Merge: 5dd1d59d35 ecc0869080
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:11:43 2019 -0800
Merge branch 'ds/commit-graph-delay-gen-progress'
One kind of progress messages were always given during commit-graph
generation, instead of following the "if it takes more than two
seconds, show progress" pattern, which has been corrected.
* ds/commit-graph-delay-gen-progress:
commit-graph: use start_delayed_progress()
progress: create GIT_PROGRESS_DELAY
commit 5dd1d59d35e1d8ea2101020df18298a9675d09b9
Merge: dac30e7b5d 4f3e57ef13
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:11:43 2019 -0800
Merge branch 'jt/clone-recursesub-ref-advise'
The interaction between "git clone --recurse-submodules" and
alternate object store was ill-designed. The documentation and
code have been taught to make more clear recommendations when the
users see failures.
* jt/clone-recursesub-ref-advise:
submodule--helper: advise on fatal alternate error
Doc: explain submodule.alternateErrorStrategy
commit dac30e7b5dd6319039328b868a99e0732afab4ff
Merge: d37cfe3b5c e714b898c6
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:11:43 2019 -0800
Merge branch 'as/t7812-missing-redirects-fix'
Test fix.
* as/t7812-missing-redirects-fix:
t7812: expect failure for grep -i with invalid UTF-8 data
t7812: add missing redirects
commit d37cfe3b5c7ef64aff0459ce2730464120c97f30
Merge: 99c4ff1bda 3798149a74
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:11:42 2019 -0800
Merge branch 'dl/pretty-reference'
"git log" family learned "--pretty=reference" that gives the name
of a commit in the format that is often used to refer to it in log
messages.
* dl/pretty-reference:
SubmittingPatches: use `--pretty=reference`
pretty: implement 'reference' format
pretty: add struct cmt_fmt_map::default_date_mode_type
pretty: provide short date format
t4205: cover `git log --reflog -z` blindspot
pretty.c: inline initalize format_context
revision: make get_revision_mark() return const pointer
completion: complete `tformat:` pretty format
SubmittingPatches: remove dq from commit reference
pretty-formats.txt: use generic terms for hash
SubmittingPatches: use generic terms for hash
commit 99c4ff1bdabc2122a7c6a2b8df87acdd0c2dd18f
Merge: 55d607d85b 26b061007c
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:11:42 2019 -0800
Merge branch 'dl/submodule-set-url'
"git submodule" learned a subcommand "set-url".
* dl/submodule-set-url:
submodule: teach set-url subcommand
commit 55d607d85b4c22fe2091102ed1eb907ea29b956a
Merge: 7c88714262 3ba3720b3f
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:11:42 2019 -0800
Merge branch 'js/mingw-inherit-only-std-handles'
Work around a issue where a FD that is left open when spawning a
child process and is kept open in the child can interfere with the
operation in the parent process on Windows.
* js/mingw-inherit-only-std-handles:
mingw: forbid translating ERROR_SUCCESS to an errno value
mingw: do set `errno` correctly when trying to restrict handle inheritance
mingw: restrict file handle inheritance only on Windows 7 and later
mingw: spawned processes need to inherit only standard handles
mingw: work around incorrect standard handles
mingw: demonstrate that all file handles are inherited by child processes
commit 7c887142621106a303a321b51b1958112ed2bf24
Merge: 5d9324e0f4 0e40a73a4c
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:11:41 2019 -0800
Merge branch 'po/bundle-doc-clonable'
Doc update.
* po/bundle-doc-clonable:
Doc: Bundle file usage
commit 5d9324e0f4210bb7d52bcb79efe3935703083f72
Merge: c58ae96fc4 d82dfa7f5b
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:11:41 2019 -0800
Merge branch 'ra/rebase-i-more-options'
"git rebase -i" learned a few options that are known by "git
rebase" proper.
* ra/rebase-i-more-options:
rebase -i: finishing touches to --reset-author-date
rebase: add --reset-author-date
rebase -i: support --ignore-date
sequencer: rename amend_author to author_to_rename
rebase -i: support --committer-date-is-author-date
sequencer: allow callers of read_author_script() to ignore fields
rebase -i: add --ignore-whitespace flag
commit c58ae96fc4bb11916b62a96940bb70bb85ea5992
Merge: 7034cd094b e440fc5888
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Dec 10 13:11:40 2019 -0800
Merge branch 'am/pathspec-from-file'
A few commands learned to take the pathspec from the
standard input or a named file, instead of taking it as the command
line arguments.
* am/pathspec-from-file:
commit: support the --pathspec-from-file option
doc: commit: synchronize <pathspec> description
reset: support the `--pathspec-from-file` option
doc: reset: synchronize <pathspec> description
pathspec: add new function to parse file
parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul`
commit 7659aa71087f206f5aea3e9fbb527905ac62785a
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Dec 10 17:54:06 2019 +0000
debian: apply security fixes from 2.24.1
Apply these as patches instead of using an upstream tarball because
the upstream tarball has not been created yet.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 99f4b37f9369ab64a71d7b49556eaa0f38951841
Merge: 04a63e80c3 7034cd094b
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Dec 9 22:41:12 2019 -0800
Sync with master
commit 7034cd094bda4edbcdff7fad1a28fcaaf9b9a040
Merge: 559c6fc317 53a06cf39b
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Dec 9 22:17:55 2019 -0800
Sync with Git 2.24.1
commit 09ac67a1839eda984b172d4d75153c767d6bbf14
Author: Denton Liu <liu.denton@gmail.com>
Date: Mon Dec 9 05:10:48 2019 -0800
format-patch: move git_config() before repo_init_revisions()
In 13cdf78094 (format-patch: teach format.notes config option,
2019-05-16), the order in which git_config() and repo_init_revisions()
were swapped so that `rev.notes_opt` would be initialized before
git_config() was called. This is problematic, however, as git_config()
should generally be called before repo_init_revisions().
Break this circular dependency by creating `show_notes` and `notes_opt`
which git_config() reads into. Then, copy these values over to
`rev.show_notes` and `rev.notes_opt` after repo_init_revisions() is
called.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 8164c961e16834da283cbf5ac5d22313b982a484
Author: Denton Liu <liu.denton@gmail.com>
Date: Mon Dec 9 05:10:46 2019 -0800
format-patch: use --notes behavior for format.notes
When we had multiple `format.notes` config values where we had `<ref1>`,
`false`, `<ref2>` (in that order), then we would print out the notes for
both `<ref1>` and `<ref2>`. This doesn't make sense, however, since we
parse the config in a top-down manner and a `false` should be able to
override previous configurations, just like how `--no-notes` will
override previous `--notes`.
Duplicate the logic that handles the `--[no-]notes[=]` option to
`format.notes` for consistency. As a result, when parsing the config
from top to bottom, `format.notes = true` will behave like `--notes`,
`format.notes = <ref>` will behave like `--notes=<ref>` and
`format.notes = false` will behave like `--no-notes`.
This change isn't strictly backwards compatible but since it is an edge
case where a sane user would not mix notes refs with `false` and this
feature is relatively new (released only in v2.23.0), this change should
be harmless.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 452538c3586a76939faf43019fb7c21b3147309b
Author: Denton Liu <liu.denton@gmail.com>
Date: Mon Dec 9 05:10:44 2019 -0800
notes: extract logic into set_display_notes()
Instead of open coding the logic that tweaks the variables in
`struct display_notes_opt` within handle_revision_opt(), abstract away the
logic into set_display_notes() so that it can be reused.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit e6e230eeae0f3cb46c4c356e6cd0a0f1119a2a83
Author: Denton Liu <liu.denton@gmail.com>
Date: Mon Dec 9 05:10:41 2019 -0800
notes: create init_display_notes() helper
We currently open code the initialization for revs->notes_opt. Abstract
this away into a helper function so that the logic can be reused in a
future commit.
This is slightly wasteful as we memset the struct twice but this is only
run once so it shouldn't have any major effect.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 1e6ed5441a61b5085978e0429691e2e2425f6846
Author: Denton Liu <liu.denton@gmail.com>
Date: Mon Dec 9 05:10:39 2019 -0800
notes: rename to load_display_notes()
According to the function comment, init_display_notes() was supposed to
"Load the notes machinery for displaying several notes trees." Rename
this function to load_display_notes() so that its use is more accurately
represented.
This is done because, in a future commit, we will reuse the name
init_display_notes().
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit e05e8cf074562dca433c3f984f9fc249fc73b056
Author: René Scharfe <l.s.r@web.de>
Date: Sat Dec 7 13:20:33 2019 +0100
archive-zip: use enum for compression method
Add an enumeration to assign names to the magic values that determine
the ZIP compression method to use. Use those names to improve code
readability.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 11de8dd7efae9763f9ecf5ada26d03879fad2dcb
Author: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
Date: Sun Dec 8 11:26:47 2019 +0200
l10n: minor case fix in 'git branch' '--unset-upstream' description
Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 8cf8f9b4aa798c93b33a1838eba17ccd3fb31f43
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat Dec 7 22:22:44 2019 +0000
t3404: fix indentation
This test case was added in 66ae9a57b88 (t3404: rebase -i: demonstrate
short SHA-1 collision, 2013-08-23), and it is not indented in the way we
usually indent sub-shell code in our test cases these days.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 4507ecc7710e172ed36421eaa4efe743785ccb4b
Author: René Scharfe <l.s.r@web.de>
Date: Sat Dec 7 20:16:51 2019 +0100
patch-id: use oid_to_hex() to print multiple object IDs
flush_current_id() prints the hexadecimal representation of two object
IDs. When the code was added in f97672225b (Add "git-patch-id" program
to generate patch ID's., 2005-06-23), sha1_to_hex() had only a single
internal static buffer, so the result of one invocation had to be stored
in a local buffer.
Since dcb3450fd8 (sha1_to_hex() usage cleanup, 2006-05-03) it rotates
through four buffers, which allows to print up to four object IDs at the
same time. 1a876a69af6 (patch-id: convert to use struct object_id,
2015-03-13) replaced sha1_to_hex() with oid_to_hex(), which has the same
feature. Use it to simplify the code.
Signed-off-by: René Scharfe <l.s.r@web.de>
Acked-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 147ee35558a300a7e51af5335ef59b09fd57ab7c
Author: René Scharfe <l.s.r@web.de>
Date: Sat Dec 7 12:16:04 2019 +0100
commit: use strbuf_add() to add a length-limited string
This is shorter and simpler.
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 04a63e80c3f26983a648d4522f8db8f84479ad2b
Merge: e0522318ac 559c6fc317
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Dec 6 15:11:14 2019 -0800
Sync with master
commit 559c6fc317f92a0a3994f816d3513cd322745852
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Dec 6 15:10:00 2019 -0800
The fourth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 56e6c16394493ebcd6b00a158f5db1e6fe7c58e7
Merge: 3b3d9ea6a8 14b7664df8
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Dec 6 15:09:24 2019 -0800
Merge branch 'dl/lore-is-the-archive'
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
commit 3b3d9ea6a8fbf36a8710b855062c685d9a7d33e3
Merge: 7cb0d37f6d 3eae30e464
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Dec 6 15:09:23 2019 -0800
Merge branch 'jk/lore-is-the-archive'
Doc update for the mailing list archiving and nntp service.
* jk/lore-is-the-archive:
doc: replace public-inbox links with lore.kernel.org
doc: recommend lore.kernel.org over public-inbox.org
commit 7cb0d37f6dcf8b6f0e176c9080ee0e6a9ce52ab0
Merge: 403ac1381c b8dcc45387
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Dec 6 15:09:23 2019 -0800
Merge branch 'tg/perf-remove-stale-result'
PerfTest fix to avoid stale result mixed up with the latest round
of test results.
* tg/perf-remove-stale-result:
perf-lib: use a single filename for all measurement types
commit 403ac1381cc8bed5e02963a955f2a2a626620eaa
Merge: f0cf2fee5d 5cf7a17dfb
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Dec 6 15:09:22 2019 -0800
Merge branch 'jk/send-pack-check-negative-with-quick'
Performance tweak on "git push" into a repository with many refs
that point at objects we have never heard of.
* jk/send-pack-check-negative-with-quick:
send-pack: use OBJECT_INFO_QUICK to check negative objects
commit f0cf2fee5d37384d5650477e6bdca2be68075042
Merge: 391fb22ac7 867fc7f310
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Dec 6 15:09:22 2019 -0800
Merge branch 'hi/grep-do-not-return-void'
Code cleanup.
* hi/grep-do-not-return-void:
grep: don't return an expression from pcre2_free()
commit 391fb22ac760042fd1cffe451f4ec9a4eb57e39e
Merge: 92b52e1bd6 2059e79c0d
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Dec 6 15:09:22 2019 -0800
Merge branch 'rs/use-skip-prefix-more'
Code cleanup.
* rs/use-skip-prefix-more:
name-rev: use skip_prefix() instead of starts_with()
push: use skip_prefix() instead of starts_with()
shell: use skip_prefix() instead of starts_with()
fmt-merge-msg: use skip_prefix() instead of starts_with()
fetch: use skip_prefix() instead of starts_with()
commit 92b52e1bd64b048beba44abae8a72b7ebebd9529
Merge: 4ba74ca901 54a7a64613
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Dec 6 15:09:22 2019 -0800
Merge branch 'rs/simplify-prepare-cmd'
Code cleanup.
* rs/simplify-prepare-cmd:
run-command: use prepare_git_cmd() in prepare_cmd()
commit 4ba74ca901407a64186c40ed9e59bbd9b2277993
Merge: f233c9f455 271c351b2f
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Dec 6 15:09:22 2019 -0800
Merge branch 'rs/test-cleanup'
Test cleanup.
* rs/test-cleanup:
t7811: don't create unused file
t9300: don't create unused file
test: use test_must_be_empty F instead of test_cmp empty F
test: use test_must_be_empty F instead of test -z $(cat F)
t1400: use test_must_be_empty
t1410: use test_line_count
t1512: use test_line_count
commit f233c9f4550a831a69892e0a38db2a7654beb995
Merge: ef3ce7c4b9 befd4f6a81
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Dec 6 15:09:21 2019 -0800
Merge branch 'sg/assume-no-todo-update-in-cherry-pick'
While running "revert" or "cherry-pick --edit" for multiple
commits, a recent regression incorrectly detected "nothing to
commit, working tree clean", instead of replaying the commits,
which has been corrected.
* sg/assume-no-todo-update-in-cherry-pick:
sequencer: don't re-read todo for revert and cherry-pick
commit ef3ce7c4b9f5ed7a13a0efcc576df855c4fd3d0f
Merge: 083378cc35 176441bfb5
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Dec 6 15:09:21 2019 -0800
Merge branch 'sg/osx-force-gcc-9'
TravisCI update.
* sg/osx-force-gcc-9:
ci: build Git with GCC 9 in the 'osx-gcc' build job
commit e0522318ac56aeb88f14e72ba2db25912e9972de
Merge: 2d72b8cffe 0bb313a552
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Dec 6 13:03:53 2019 -0800
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
commit 2d72b8cffed019aeecc9015be1a2eca4a853db4b
Merge: 9129e71939 cae0bc09ab
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Dec 6 13:03:53 2019 -0800
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
commit 9129e719399a5d608b0ca9eda03e062e0c2c4558
Merge: f85fac6f6e d9b31db2c4
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Dec 6 13:03:52 2019 -0800
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
...
commit abcf8573005d548fe213aa7b4579394fa18692a1
Author: Denton Liu <liu.denton@gmail.com>
Date: Fri Dec 6 12:16:31 2019 -0800
range-diff: clear `other_arg` at end of function
We were leaking memory by not clearing `other_arg` after we were done
using it. Clear it after we've finished using it.
Note that this isn't strictly necessary since the memory will be
reclaimed once the command exits. However, since we are releasing the
strbufs, we should also clear `other_arg` for consistency.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit f8675343d79058ab5200e93e6c33058e13d7bb43
Author: Denton Liu <liu.denton@gmail.com>
Date: Fri Dec 6 12:16:26 2019 -0800
range-diff: mark pointers as const
The contents pointed to by `diffopt` and `other_arg` should not be
modified. Mark these as `const` to indicate this.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 828765dfe0a4a1baae7fae750cbb6a62fcb32c7a
Author: Denton Liu <liu.denton@gmail.com>
Date: Fri Dec 6 12:16:22 2019 -0800
t3206: fix incorrect test name
The name of the test used to indicate that it was testing the `--notes`
option but it was really testing the `format.notes` configuration.
Correct the test name to reflect this.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 0d9b0d78859b5a6d91d57609305b1c6eb326bf7e
Author: SZEDER Gábor <szeder.dev@gmail.com>
Date: Fri Dec 6 20:03:31 2019 +0100
t9300-fast-import: don't hang if background fast-import exits too early
The five tests checking 'git fast-import's checkpoint handling in
't9300-fast-import.sh', all with the prefix "V:" in their test
description, can hang indefinitely if 'git fast-import' unexpectedly
dies early in any of these tests.
These five tests run 'git fast-import' in the background, while
feeding instructions to its standard input through a fifo (fd 8) from
a background subshell, and reading and verifying its standard output
through another fifo (fd 9) in the test script's main shell process.
This "reading and verifying" is basically a 'while read ...' shell
loop iterating until 'git fast-import' outputs the expected line,
ignoring any other output. This doesn't work very well when 'git
fast-import' dies before printing that particular line, because the
'read' builtin doesn't get EOF after the death of 'git fast-import',
as their input and output are not connected directly but through a
fifo. Consequently, that 'read' hangs waiting for the next line from
the already dead 'git fast-import', leaving the test script and in
turn the whole test suite hanging.
Avoid this hang by checking whether the background 'git fast-import'
process exited unexpectedly early, and interrupt the 'while read' loop
if it did. We have to jump through some hoops to achive that, though:
- Start the background 'git fast-import' in another background
subshell, which then:
- prints the PID of that 'git fast-import' process to the fifo,
to be read by the main shell process, so it will know which
process to kill when the test is finished.
- waits until that 'git fast-import' process exits. If it does
exit, then report its exit code, and write a message to the
fifo used for 'git fast-import's standard output, thus
un-block the 'read' builtin in the main shell process.
- Modify that 'while read' loop to break the loop upon seeing that
message, and fail the test in the usual way.
- Once the test is finished kill that background subshell as well,
and do so before killing the background 'git fast-import'.
Otherwise the background 'git fast-import' and subshell processes
would die racily, and if 'git fast-import' were to die sooner,
then we might get some undesired and potentially confusing
messages in the test's output.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 21f57620b2e73d20f5c98006af756e0162eaee3b
Author: SZEDER Gábor <szeder.dev@gmail.com>
Date: Fri Dec 6 20:03:30 2019 +0100
t9300-fast-import: store the PID in a variable instead of pidfile
The five tests running 'git fast-import' in the background in
't9300-fast-import.sh' store the PID of that background process in a
pidfile, to be used to check whether that background process survived
each test and then to kill it in test_when_finished commands. To
achieve this all these five tests run three $(cat <pidfile>) command
substitutions each.
Store the PID of the background 'git fast-import' in a variable to
avoid those extra processes.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit b4bbbbd5a247e0e75d079bca591b657ec9084a46
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri Dec 6 13:08:25 2019 +0000
apply --allow-overlap: fix a corner case
Yes, yes, this is supposed to be only a band-aid option for `git add -p`
not Doing The Right Thing. But as long as we carry the `--allow-overlap`
option, we might just as well get it right.
This fixes the case where one hunk inserts a line before the first line,
and is followed by a hunk whose context overlaps with the first one's
and which appends a line at the end.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 89c8559367aae771006cc0956b6f5e54cc8c614c
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri Dec 6 13:08:24 2019 +0000
git add -p: use non-zero exit code when the diff generation failed
The first thing `git add -p` does is to generate a diff. If this diff
cannot be generated, `git add -p` should not continue as if nothing
happened, but instead fail.
What we *actually* do here is much broader: we now verify for *every*
`run_cmd_pipe()` call that the spawned process actually succeeded.
Note that we have to change two callers in this patch, as we need to
store the spawned process' output in a local variable, which means that
the callers can no longer decide whether to interpret the `return <$fh>`
in array or in scalar context.
This bug was noticed while writing a test case for the diff.algorithm
feature, and we let that test case double as a regression test for this
fixed bug, too.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit e91162be9ce7195309dc2b7e3c03988481cee850
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri Dec 6 13:08:23 2019 +0000
t3701: verify that the diff.algorithm config setting is handled
Without this patch, there is actually no test in Git's test suite that
covers the diff.algorithm feature. Let's add one.
We do this by passing a bogus value and then expecting `git diff-files`
to produce the appropriate error message.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 0c3222c4f322c586099d2773e180dabf6d4f6568
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri Dec 6 13:08:22 2019 +0000
t3701: verify the shown messages when nothing can be added
In preparation for re-implementing `git add -p` in pure C (where we will
purposefully keep the implementation of `git add -p` separate from the
implementation of `git add -i`), let's verify that the user is told the
same things as in the Perl version when the diff file is either empty or
contains only entries about binary files.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 24be352d52f96b2cace4d3e5f01f02917b7d649b
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri Dec 6 13:08:21 2019 +0000
t3701: add a test for the different `add -p` prompts
The `git add -p` command offers different prompts for regular diff hunks
vs mode change pseudo hunks vs diffs deleting files.
Let's cover this in the regresion test suite, in preparation for
re-implementing `git add -p` in C.
For the mode change prompt, we use a trick that lets this test case pass
even on systems without executable bit, i.e. where `core.filemode =
false` (such as Windows): we first add the file to the index with `git
add --chmod=+x`, and then call `git add -p` with `core.filemode` forced
to `true`. The file on disk has no executable bit set, therefore we will
see a mode change.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 8539b465341cc475f219ed46273a1c157bddafa0
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri Dec 6 13:08:20 2019 +0000
t3701: avoid depending on the TTY prerequisite
The TTY prerequisite is a rather heavy one: it not only requires Perl to
work, but also the IO/Pty.pm module (with native support, and it
requires pseudo terminals, too).
In particular, test cases marked with the TTY prerequisite would be
skipped in Git for Windows' SDK.
In the case of `git add -p`, we do not actually need that big a hammer,
as we do not want to test any functionality that requires a pseudo
terminal; all we want is for the interactive add command to use color,
even when being called from within the test suite.
And we found exactly such a trick earlier already: when we added a test
case to verify that the main loop of `git add -i` is colored
appropriately. Let's use that trick instead of the TTY prerequisite.
While at it, we avoid the pipes, as we do not want a SIGPIPE to break
the regression test cases (which will be much more likely when we do not
run everything through Perl because that is inherently slower).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 0f0fba2cc87219bf0c182201b7798ceb74c24857
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri Dec 6 13:08:19 2019 +0000
t3701: add a test for advanced split-hunk editing
In this developer's workflows, it often happens that a hunk needs to be
edited in a way that adds lines, and sometimes even reduces the number
of context lines.
Let's add a regression test for this.
Note that just like the preceding test case, the new test case is *not*
handled gracefully by the current `git add -p`. It will be handled
correctly by the upcoming built-in `git add -p`, though.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit f85fac6f6eedeb72469441dac97a7b59b027bf1f
Merge: c87e168cd6 083378cc35
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:57:42 2019 -0800
Sync with master
* master:
The third batch
commit c87e168cd693e26cb0e5472328b5624e454aa27c
Merge: 923a6a7ab6 14b7664df8
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:57:31 2019 -0800
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
commit 923a6a7ab607ec403c34f8878470721d3f7a5ce9
Merge: d0c91f4d1b f6b9413baf
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:57:31 2019 -0800
Merge branch 'ag/sequencer-continue-leakfix' into next
Leakfix.
* ag/sequencer-continue-leakfix:
sequencer: fix a memory leak in sequencer_continue()
commit d0c91f4d1bb3a661ef6730acac60ae8c1cd8dd10
Merge: 85c7940aeb 0109d676f9
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:57:30 2019 -0800
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
commit 85c7940aeb7b39d79142cb770cfbbe45070c7f5e
Merge: 35fc8e839a 7187c7bbb8
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:57:30 2019 -0800
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
commit 35fc8e839a0eebed31a827176787f34c21f7218c
Merge: d0ce4bcc90 72b006f4bf
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:57:30 2019 -0800
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
commit d0ce4bcc90fb8c7eb58ed57e43053da398f7c028
Merge: 887d5559bb c64368e3a2
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:57:30 2019 -0800
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
commit 887d5559bb5aab0a9e1a3c4a88e2c991e79e4cda
Merge: 7819efee07 ec48540fe8
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:57:29 2019 -0800
Merge branch 'cs/store-packfiles-in-hashmap' into next
In a repository with many packfiles, the cost of the procedure that
avoids registering the same packfile twice was unnecessarily high
by using an inefficient search algorithm, which has been corrected.
* cs/store-packfiles-in-hashmap:
packfile.c: speed up loading lots of packfiles
commit 7819efee07785c61b5742d094669a251e69c134a
Merge: 6d9e3930ec fc42f20e24
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:57:29 2019 -0800
Merge branch 'sg/test-squelch-noise-in-commit-bulk' into next
Code cleanup.
* sg/test-squelch-noise-in-commit-bulk:
test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk'
commit 6d9e3930ec49db5a0b97ada40831ea737e16a775
Merge: 9252a4b1b6 528d9e6d01
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:57:29 2019 -0800
Merge branch 'jk/perf-wo-git-dot-pm' into next
Test cleanup.
* jk/perf-wo-git-dot-pm:
t/perf: don't depend on Git.pm
commit 9252a4b1b62a9d0c53c37d5c1601a1c904d9dff5
Merge: fc071dddfe ecc0869080
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:57:28 2019 -0800
Merge branch 'ds/commit-graph-delay-gen-progress' into next
One kind of progress messages were always given during commit-graph
generation, instead of following the "if it takes more than two
seconds, show progress" pattern, which has been corrected.
* ds/commit-graph-delay-gen-progress:
commit-graph: use start_delayed_progress()
progress: create GIT_PROGRESS_DELAY
commit fc071dddfec9e5b765311f106af3b4a9cb659385
Merge: aa89a7945f 4f3e57ef13
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:57:28 2019 -0800
Merge branch 'jt/clone-recursesub-ref-advise' into next
The interaction between "git clone --recurse-submodules" and
alternate object store was ill-designed. The documentation and
code have been taught to make more clear recommendations when the
users see failures.
* jt/clone-recursesub-ref-advise:
submodule--helper: advise on fatal alternate error
Doc: explain submodule.alternateErrorStrategy
commit aa89a7945f9dde775fd6645cea24fefc8475ad0e
Merge: 30cfe5c15d e714b898c6
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:57:28 2019 -0800
Merge branch 'as/t7812-missing-redirects-fix' into next
Test fix.
* as/t7812-missing-redirects-fix:
t7812: expect failure for grep -i with invalid UTF-8 data
t7812: add missing redirects
commit 30cfe5c15d6f8b857bb03a35ead7cb27fc606bdd
Merge: 466f07fb63 2e697ced9d
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:57:28 2019 -0800
Merge branch 'js/builtin-add-i-cmds' into next
"git add -i" that is getting rewritten in C has been extended to
cover subcommands other than the "patch".
* js/builtin-add-i-cmds:
built-in add -i: offer the `quit` command
built-in add -i: re-implement the `diff` command
built-in add -i: implement the `patch` command
built-in add -i: re-implement `add-untracked` in C
built-in add -i: re-implement `revert` in C
built-in add -i: implement the `update` command
built-in add -i: prepare for multi-selection commands
built-in add -i: allow filtering the modified files list
add-interactive: make sure to release `rev.prune_data`
commit 466f07fb632d804b5280e999b11830d5a018daa7
Merge: 0972133ad2 b8dcc45387
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:57:28 2019 -0800
Merge branch 'tg/perf-remove-stale-result' into next
PerfTest fix to avoid stale result mixed up with the latest round
of test results.
* tg/perf-remove-stale-result:
perf-lib: use a single filename for all measurement types
commit 0972133ad2362ab7ba1cd7c1f56be2be65ac0141
Merge: a164eccad1 3798149a74
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:57:27 2019 -0800
Merge branch 'dl/pretty-reference' into next
"git log" family learned "--pretty=ref" that gives the name of a
commit in the format that is often used to refer to it in log
messages.
* dl/pretty-reference:
SubmittingPatches: use `--pretty=reference`
pretty: implement 'reference' format
pretty: add struct cmt_fmt_map::default_date_mode_type
pretty: provide short date format
t4205: cover `git log --reflog -z` blindspot
pretty.c: inline initalize format_context
revision: make get_revision_mark() return const pointer
completion: complete `tformat:` pretty format
SubmittingPatches: remove dq from commit reference
pretty-formats.txt: use generic terms for hash
SubmittingPatches: use generic terms for hash
commit a164eccad199d3efd7596662dd1c8cfe5317674a
Merge: 289f13054b 26b061007c
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:57:27 2019 -0800
Merge branch 'dl/submodule-set-url' into next
"git submodule" learned a subcommand "set-url".
* dl/submodule-set-url:
submodule: teach set-url subcommand
commit 289f13054be7ac9e7d6ab375cd8585a9154b212e
Merge: 8f36a354ae 3ba3720b3f
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:57:26 2019 -0800
Merge branch 'js/mingw-inherit-only-std-handles' into next
Work around a issue where a FD that is left open when spawning a
child process and is kept open in the child can interfere with the
operation in the parent process on Windows.
* js/mingw-inherit-only-std-handles:
mingw: forbid translating ERROR_SUCCESS to an errno value
commit 083378cc35c4dbcc607e4cdd24a5fca440163d17
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:43:59 2019 -0800
The third batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 88bd37a2d0f9ed504ac49fcecf6371d9fafc2a67
Merge: 473b431410 a4fb016ba1
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:52:49 2019 -0800
Merge branch 'js/pkt-line-h-typofix'
Typofix.
* js/pkt-line-h-typofix:
pkt-line: fix a typo
commit 473b431410f5dbaa0c6a7bcc1e49b73c505cfe89
Merge: e0f9ec9027 679f2f9fdd
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:52:48 2019 -0800
Merge branch 'us/unpack-trees-fsmonitor'
Users of oneway_merge() (like "reset --hard") learned to take
advantage of fsmonitor to avoid unnecessary lstat(2) calls.
* us/unpack-trees-fsmonitor:
unpack-trees: skip stat on fsmonitor-valid files
commit e0f9ec90278ec989ac7840a69f42a414f0db23f5
Merge: fd952307ec a85efb5985
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:52:48 2019 -0800
Merge branch 'sg/test-bool-env'
Recently we have declared that GIT_TEST_* variables take the
usual boolean values (it used to be that some used "non-empty
means true" and taking GIT_TEST_VAR=YesPlease as true); make
sure we notice and fail when non-bool strings are given to
these variables.
* sg/test-bool-env:
t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool
tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values
commit fd952307ec2a260b1ed668d56f1a4cf3569baee3
Merge: e547e5a89e 0aa0c2b2ec
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:52:48 2019 -0800
Merge branch 'mh/clear-topo-walk-upon-reset'
The revision walking machinery uses resources like per-object flag
bits that need to be reset before a new iteration of walking
begins, but the resources related to topological walk were not
cleared correctly, which has been corrected.
* mh/clear-topo-walk-upon-reset:
revision: free topo_walk_info before creating a new one in init_topo_walk
revision: clear the topo-walk flags in reset_revision_walk
commit e547e5a89e3641bae02e762bcb0062951bb698e5
Merge: 88cf80949e ebc3278665
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:52:47 2019 -0800
Merge branch 'hv/assume-priumax-is-available-anywhere'
We have had compatibility fallback macro definitions for "PRIuMAX",
"PRIu32", etc. but did not for "PRIdMAX", while the code used the
last one apparently without any hiccup reported recently. The
fallback macro definitions for these <inttypes.h> macros that must
appear in C99 systems have been removed.
* hv/assume-priumax-is-available-anywhere:
git-compat-util.h: drop the `PRIuMAX` and other fallback definitions
commit 88cf80949e0a4c3cacd4be80358e5fe62acbf0ae
Merge: 8feb47e882 1f3aea22c7
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Dec 5 12:52:47 2019 -0800
Merge branch 'mg/submodule-status-from-a-subdirectory'
"git submodule status" that is run from a subdirectory of the
superproject did not work well, which has been corrected.
* mg/submodule-status-from-a-subdirectory:
submodule: fix 'submodule status' when called from a subdirectory
![[bug history graph]](https://qa.debian.org/data/bts/graphs/g/git.png){kind=link}