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 3ca233cdcd291115c9ddd3e8b998215acee960bc
Merge: 7ab4295ed 08e3c1f89
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun Aug 18 17:13:35 2019 -0700
Merge branch 'debian-sid' into debian-experimental
* debian-sid:
debian: new upstream release
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 08e3c1f89f4a13ba10dec8f778e5101224a3a05b
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun Aug 18 16:59:06 2019 -0700
debian: new upstream release
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 945b585cd7c8efc6417270abda111d3c70b85a9b
Merge: 2550665a8 5fa0f5238
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun Aug 18 16:56:52 2019 -0700
Merge tag 'v2.23.0' into debian-sid
Git 2.23
commit 7ab4295edcb1e1904e18f96f8e52900d64a0d9b7
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun Aug 18 16:56:03 2019 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 61e0c1ff9a4774f67d93d8d57d135d315ed11c99
Merge: cd941527e 17f5b7556
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun Aug 18 16:53:46 2019 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
commit 17f5b7556cbe9867bed85982f386e41d9db77e19
Merge: e5444969c 5fa0f5238
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Aug 16 10:32:25 2019 -0700
Sync with Git 2.23
commit e5444969c986fc1503282c63d33931021c78d991
Merge: 65efc6334 507e5470a
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Aug 14 13:27:39 2019 -0700
Merge branch 'sg/worktree-remove-errormsg' into next
Error message update/clarification.
* sg/worktree-remove-errormsg:
worktree remove: clarify error message on dirty worktree
commit 65efc63345065b840a4e1bc2984a0935c6fc83bf
Merge: 3010a7d19 d1387d389
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Aug 14 13:27:38 2019 -0700
Merge branch 'en/fast-import-merge-doc' into next
Doc update.
* en/fast-import-merge-doc:
git-fast-import.txt: clarify that multiple merge commits are allowed
commit 3010a7d19fa1614479a5c2e88431845227756fe3
Merge: 972c8dd4c 362f8b280
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Aug 14 13:27:38 2019 -0700
Merge branch 'jk/perf-no-dups' into next
Test & perf scripts must use unique numeric prefix, but a pair
shared the same number, which is fixed here.
* jk/perf-no-dups:
t/perf: rename duplicate-numbered test script
commit 507e5470a0e8be7e2a50a5ffe1f690d06dc00056
Author: SZEDER Gábor <szeder.dev@gmail.com>
Date: Tue Aug 13 20:02:44 2019 +0200
worktree remove: clarify error message on dirty worktree
To avoid data loss, 'git worktree remove' refuses to delete a worktree
if it's dirty or contains untracked files. However, the error message
only mentions that the worktree "is dirty", even if the worktree in
question is in fact clean, but contains untracked files:
$ git worktree add test-worktree
Preparing worktree (new branch 'test-worktree')
HEAD is now at aa53e60 Initial
$ >test-worktree/untracked-file
$ git worktree remove test-worktree/
fatal: 'test-worktree/' is dirty, use --force to delete it
$ git -C test-worktree/ diff
$ git -C test-worktree/ diff --cached
$ # Huh? Where are those dirty files?!
Clarify this error message to say that the worktree "contains modified
or untracked files".
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Reviewed-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit d1387d389549fe6e1b97ad88a0f7dbf3afe96c16
Author: Elijah Newren <newren@gmail.com>
Date: Mon Aug 12 10:17:47 2019 -0700
git-fast-import.txt: clarify that multiple merge commits are allowed
The grammar for commits used a '?' rather than a '*' on the `merge`
directive line, despite the fact that the code allows multiple `merge`
directives in order to support n-way merges. In fact, elsewhere in
git-fast-import.txt there is an explicit declaration that "an unlimited
number of `merge` commands per commit are permitted by fast-import".
Fix the grammar to match the intent and implementation.
Reported-by: Joachim Klein <joachim.klein@automata.tools>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 362f8b280c0cdf2b7bbb0a8575e617a105f0a3ff
Author: Jeff King <peff@peff.net>
Date: Mon Aug 12 11:58:03 2019 -0400
t/perf: rename duplicate-numbered test script
There are two perf scripts numbered p5600, but with otherwise different
names ("clone-reference" versus "partial-clone"). We store timing
results in files named after the whole script, so internally we don't
get confused between the two. But "aggregate.perl" just prints the test
number for each result, giving multiple entries for "5600.3". It also
makes it impossible to skip one test but not the other with
GIT_SKIP_TESTS.
Let's renumber the one that appeared later (by date -- the source of the
problem is that the two were developed on independent branches). For the
non-perf test suite, our test-lint rule would have complained about this
when the two were merged, but t/perf never learned that trick.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 972c8dd4cc8a195b6771ac4d35d80f62b12a703b
Merge: d394a973d ff66981f4
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Aug 11 17:43:12 2019 -0700
Sync with master
* master:
doc: fix repeated words
Git 2.22.1
.mailmap: update email address of Philip Oakley
commit d394a973d06ea6b1bf9056c24a103234ba811fd0
Merge: 0e9286fb7 2e27de94d
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Aug 9 10:18:49 2019 -0700
Sync with 2.23-rc2
* master:
Git 2.23-rc2
commit 0e9286fb709de0cd47258c1b336e889d9118f5e1
Merge: c49ece8a0 70597e838
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Aug 9 10:18:28 2019 -0700
Merge branch 'rs/nedalloc-fixlets' into next
Compilation fix.
* rs/nedalloc-fixlets:
nedmalloc: avoid compiler warning about unused value
nedmalloc: do assignments only after the declaration section
commit c49ece8a0d9b1368a4c79945391fdb7ce850900d
Merge: 87f61abb7 ffe1afe67
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Aug 9 10:16:51 2019 -0700
Merge branch 'sg/show-failed-test-names' into next
The first line of verbose output from each test piece now carries
the test name and number to help scanning with eyeballs.
* sg/show-failed-test-names:
tests: show the test name and number at the start of verbose output
t0000-basic: use realistic test script names in the verbose tests
commit 87f61abb7371ef81a3e095d95ffc62b6de34d311
Merge: ad2d7630d 7c5c9b9c5
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Aug 9 10:16:51 2019 -0700
Merge branch 'sg/commit-graph-validate' into next
The code to write commit-graph over given commit object names has
been made a bit more robust.
* sg/commit-graph-validate:
commit-graph: error out on invalid commit oids in 'write --stdin-commits'
commit-graph: turn a group of write-related macro flags into an enum
t5318-commit-graph: use 'test_expect_code'
commit ad2d7630d1417f07c0b4e7d66e22f6b916e73354
Merge: 6bd6c85fb 620c09e1b
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Aug 9 10:16:51 2019 -0700
Merge branch 'vn/restore-empty-ita-corner-case-fix' into next
"git checkout" and "git restore" to re-populate the index from a
tree-ish (typically HEAD) did not work correctly for a path that
was removed and then added again with the intent-to-add bit, when
the corresponding working tree file was empty. This has been
corrected.
* vn/restore-empty-ita-corner-case-fix:
restore: add test for deleted ita files
checkout.c: unstage empty deleted ita files
commit 6bd6c85fbb3ad2508d78bf7495e2210848411c3e
Merge: a6eeba6e5 a613d4f81
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Aug 9 10:16:51 2019 -0700
Merge branch 'sc/pack-refs-deletion-racefix' into next
"git pack-refs" can lose refs that are created while running, which
is getting corrected.
* sc/pack-refs-deletion-racefix:
pack-refs: always refresh after taking the lock file
commit a6eeba6e5dde0b587391d3e069387623e3c50c46
Merge: fd54f4faf c2a8c3701
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Aug 8 14:27:25 2019 -0700
Sync with master
* master:
commit fd54f4fafccbe60a99252ed39607590b670dd786
Merge: bd704faa3 7f0b59087
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Aug 8 12:52:23 2019 -0700
Merge branch 'bc/hash-independent-tests-part-4' into next
Test fix.
* bc/hash-independent-tests-part-4:
t0000: reword comments for "local" test
t: decrease nesting in test_oid_to_path
commit cd941527e4a5fff2f43174ed2f9d4f262bd60fda
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed Aug 7 22:51:11 2019 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit dab07fc971cc7c8b2b142137b40c5c6ff1405e89
Merge: 941907e5d bd704faa3
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed Aug 7 22:49:05 2019 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
commit bd704faa3ef225a18d029a1b91aa12d56a84a056
Merge: 68e9a16b4 86ad3ea5c
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Aug 7 14:32:35 2019 -0700
Merge branch 'rs/plug-strbuf-reak-in-read-alt-refs' into next
Leakfix.
* rs/plug-strbuf-reak-in-read-alt-refs:
sha1-file: release strbuf after use
commit 68e9a16b4a97e764843c258f8ac9425ca60e4bc2
Merge: 9094f5b30 7df3bd462
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Aug 7 14:32:35 2019 -0700
Merge branch 'mt/dir-iterator-updates' into next
Leakfix.
* mt/dir-iterator-updates:
test-dir-iterator: use path argument directly
dir-iterator: release strbuf after use
commit 9094f5b305e8d83da90d300978dc26aff7e167f8
Merge: 24aa435a4 0aa6bce73
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Aug 7 14:32:35 2019 -0700
Merge branch 'ds/commit-graph-incremental' into next
Leakfix.
* ds/commit-graph-incremental:
commit-graph: release strbufs after use
commit 24aa435a4b22cacc78a4d52be05be7d69b392b50
Merge: f1efcbfd9 182f59daf
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Aug 7 14:32:34 2019 -0700
Merge branch 'ja/l10n-fixes' into next
A few messages have been updated to help localization better.
* ja/l10n-fixes:
l10n: reformat some localized strings for v2.23.0
commit f1efcbfd99682fbea2da40a10d54d86e0c721507
Merge: 6a047a809 ff6d54771
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Aug 7 14:32:34 2019 -0700
Merge branch 'en/disable-dir-rename-in-recursive-merge' into next
"merge-recursive" hit a BUG() when building a virtual merge base
detected a directory rename.
* en/disable-dir-rename-in-recursive-merge:
merge-recursive: avoid directory rename detection in recursive case
commit 6a047a80926a850a24a2f078fded4ee0e49a46bb
Merge: 128135f4e 21416f0a0
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Aug 7 14:32:34 2019 -0700
Merge branch 'nd/switch-and-restore' into next
Docfix.
* nd/switch-and-restore:
restore: fix typo in docs
commit 128135f4e49d18162e02b6ba08e7c72232ce0758
Merge: 9f8eaf7c4 6d1692279
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Aug 7 14:32:34 2019 -0700
Merge branch 'mr/doc-can-not-to-cannot' into next
Docfix.
* mr/doc-can-not-to-cannot:
doc: typo: s/can not/cannot/ and s/is does/does/
commit 9f8eaf7c4eb15e6d63867b9ce10646407bc8fe58
Merge: deed80330 a35bea40b
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Aug 7 14:32:33 2019 -0700
Merge branch 'ds/commit-graph-octopus-fix' into next
commit-graph did not handle commits with more than two parents
correctly, which has been corrected.
* ds/commit-graph-octopus-fix:
commit-graph: fix bug around octopus merges
commit 70597e838601ee6be5c43ece255c9df47f8fe9a2
Author: René Scharfe <l.s.r@web.de>
Date: Wed Aug 7 15:09:02 2019 +0200
nedmalloc: avoid compiler warning about unused value
Cast the evaluated value of the macro INITIAL_LOCK to void to instruct
the compiler that we're not interested in said value nor the following
warning:
In file included from compat/nedmalloc/nedmalloc.c:63:
compat/nedmalloc/malloc.c.h: In function ‘init_user_mstate’:
compat/nedmalloc/malloc.c.h:1706:62: error: right-hand operand of comma expression has no effect [-Werror=unused-value]
1706 | #define INITIAL_LOCK(sl) (memset(sl, 0, sizeof(MLOCK_T)), 0)
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~
compat/nedmalloc/malloc.c.h:5020:3: note: in expansion of macro ‘INITIAL_LOCK’
5020 | INITIAL_LOCK(&m->mutex);
| ^~~~~~~~~~~~
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit c9b9c09dae175f75bed4363cc6278c3f0cb3b9dd
Author: René Scharfe <l.s.r@web.de>
Date: Wed Aug 7 15:08:51 2019 +0200
nedmalloc: do assignments only after the declaration section
Avoid the following compiler warning:
In file included from compat/nedmalloc/nedmalloc.c:63:
compat/nedmalloc/malloc.c.h: In function ‘pthread_release_lock’:
compat/nedmalloc/malloc.c.h:1759:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
1759 | volatile unsigned int* lp = &sl->l;
| ^~~~~~~~
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit ffe1afe67c0fab1786ad2aa9668efabe773f73c3
Author: SZEDER Gábor <szeder.dev@gmail.com>
Date: Mon Aug 5 23:04:47 2019 +0200
tests: show the test name and number at the start of verbose output
The verbose output of every test looks something like this:
expecting success:
echo content >file &&
git add file &&
git commit -m "add file"
[master (root-commit) d1fbfbd] add file
Author: A U Thor <author@example.com>
1 file changed, 1 insertion(+)
create mode 100644 file
ok 1 - commit works
i.e. first an "expecting success" (or "checking known breakage") line
followed by the commands to be executed, then the output of those
comamnds, and finally an "ok"/"not ok" line containing the test name.
Note that the test's name is only shown at the very end.
With '-x' tracing enabled and/or in longer tests the verbose output
might be several screenfulls long, making it harder than necessary to
find where the output of the test with a given name starts (especially
when the outputs to different file descriptors are racing, and the
"expecting success"/command block arrives earlier than the "ok" line
of the previous test).
Print the test name at the start of the test's verbose output, i.e. at
the end of the "expecting success" and "checking known breakage"
lines, to make the start of a particular test a bit easier to
recognize. Also print the test script and test case numbers, to help
those poor souls who regularly have to scan through the combined
verbose output of several test scripts.
So the dummy test above would start like this:
expecting success of 9999.1 'commit works':
echo content >file &&
[...]
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 96f3ccc2abf81520740de857471ab6b200f0ea3b
Author: SZEDER Gábor <szeder.dev@gmail.com>
Date: Mon Aug 5 23:04:46 2019 +0200
t0000-basic: use realistic test script names in the verbose tests
Our test scripts are named something like 't1234-command.sh', but the
script names used in 't0000-basic.sh' don't follow this naming
convention. Normally this doesn't matter, because the test scripts
themselves don't care how they are called. However, the next patch
will start to include the test number in the test's verbose output, so
the test script's name will matter in the two tests checking the
verbose output.
Update the tests 'test --verbose' and 'test --verbose-only' to follow
out test script naming convention.
Leave the other tests in 't0000' unchanged: changing the names of
their test scripts would be only pointless code churn.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 7c5c9b9c57d58273d17dfc3fec3ebdb25077a9de
Author: SZEDER Gábor <szeder.dev@gmail.com>
Date: Mon Aug 5 10:02:40 2019 +0200
commit-graph: error out on invalid commit oids in 'write --stdin-commits'
While 'git commit-graph write --stdin-commits' expects commit object
ids as input, it accepts and silently skips over any invalid commit
object ids, and still exits with success:
# nonsense
$ echo not-a-commit-oid | git commit-graph write --stdin-commits
$ echo $?
0
# sometimes I forgot that refs are not good...
$ echo HEAD | git commit-graph write --stdin-commits
$ echo $?
0
# valid tree OID, but not a commit OID
$ git rev-parse HEAD^{tree} | git commit-graph write --stdin-commits
$ echo $?
0
$ ls -l .git/objects/info/commit-graph
ls: cannot access '.git/objects/info/commit-graph': No such file or directory
Check that all input records are indeed valid commit object ids and
return with error otherwise, the same way '--stdin-packs' handles
invalid input; see e103f7276f (commit-graph: return with errors during
write, 2019-06-12).
Note that it should only return with error when encountering an
invalid commit object id coming from standard input. However,
'--reachable' uses the same code path to process object ids pointed to
by all refs, and that includes tag object ids as well, which should
still be skipped over. Therefore add a new flag to 'enum
commit_graph_write_flags' and a corresponding field to 'struct
write_commit_graph_context', so we can differentiate between those two
cases.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Acked-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 39d88318569188c0544c3c0f8207f2e1b1829e60
Author: SZEDER Gábor <szeder.dev@gmail.com>
Date: Mon Aug 5 10:02:39 2019 +0200
commit-graph: turn a group of write-related macro flags into an enum
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Acked-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 9916073be5dc59997e7cb9f7577bc7c91fd8f44a
Author: SZEDER Gábor <szeder.dev@gmail.com>
Date: Mon Aug 5 10:02:38 2019 +0200
t5318-commit-graph: use 'test_expect_code'
In 't5318-commit-graph.sh' the test 'close with correct error on bad
input' manually verifies the exit code of a 'git commit-graph write'
command.
Use 'test_expect_code' instead.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Acked-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 941907e5d37f074ba607ea3f09d537953bd66370
Merge: fb91d6682 2550665a8
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri Aug 2 17:26:04 2019 -0700
Merge branch 'debian-sid' into debian-experimental
* debian-sid:
debian: new upstream release candidate
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 2550665a801a3af82f9301d0b7198d9eebe3c34e
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri Aug 2 17:21:49 2019 -0700
debian: new upstream release candidate
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 4af68c40f880c1bac2ff2e4b3f1d4df4b838f150
Merge: 6002896a8 7c20df84b
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri Aug 2 17:20:06 2019 -0700
Merge tag 'v2.23.0-rc1' into debian-sid
Git 2.23-rc1
commit fb91d668234379cec7f6e63665d39ec886b61ade
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri Aug 2 17:19:39 2019 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 8ad5d7568778e218911c8fbbba811a0748c82ee9
Merge: b27ac2361 deed80330
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri Aug 2 17:14:53 2019 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
commit deed80330f2f849fecaf1d22eaf715b93ef96954
Merge: e700df069 7c20df84b
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Aug 2 13:14:28 2019 -0700
Sync with 2.23-rc1
* master:
Git 2.23-rc1
commit e700df069307d1a2da142450174f7da7a11f06ed
Merge: 116467c77 decfe05bb
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Aug 2 12:46:23 2019 -0700
Merge branch 'sg/do-not-skip-non-httpd-tests' into next
Test fix.
* sg/do-not-skip-non-httpd-tests:
t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd'
t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh'
t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh'
commit 116467c77aa1a492a491ed18a90fd7b02c87de92
Merge: 678564fda 5aa02f986
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Aug 2 12:46:23 2019 -0700
Merge branch 'jk/tree-walk-overflow' into next
Codepaths to walk tree objects have been audited for integer
overflows and hardened.
* jk/tree-walk-overflow:
tree-walk: harden make_traverse_path() length computations
tree-walk: add a strbuf wrapper for make_traverse_path()
tree-walk: accept a raw length for traverse_path_len()
tree-walk: use size_t consistently
tree-walk: drop oid from traverse_info
setup_traverse_info(): stop copying oid
commit 678564fda2eff8424869e0ca8e24ca3e68e1b30e
Merge: e1a46a195 814291cf3
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Aug 2 12:46:23 2019 -0700
Merge branch 'sg/t5510-test-i18ngrep-fix' into next
Test fix.
* sg/t5510-test-i18ngrep-fix:
t5510-fetch: fix negated 'test_i18ngrep' invocation
commit e1a46a195f3a2dea64809d0cc4bb1ee5c7b47ba6
Merge: 9bef959d2 6a289d45c
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Aug 2 12:46:23 2019 -0700
Merge branch 'mt/grep-submodules-working-tree' into next
"git grep --recurse-submodules" that looks at the working tree
files looked at the contents in the index in submodules, instead of
files in the working tree.
* mt/grep-submodules-working-tree:
grep: fix worktree case in submodules
commit 9bef959d2d739021428b84f3256f382c6ef29238
Merge: a062d81c1 d61e6ce1d
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Aug 2 12:46:23 2019 -0700
Merge branch 'sg/fsck-config-in-doc' into next
Doc update.
* sg/fsck-config-in-doc:
Documentation/git-fsck.txt: include fsck.* config variables
commit a062d81c1fa51b5683254ece5eb53dd612b107bc
Merge: 78b2527b6 b91408400
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Aug 2 12:46:22 2019 -0700
Merge branch 'js/visual-studio' into next
Support building Git with Visual Studio
The bits about .git/branches/* have been dropped from the series.
We may want to drop the support for it, but until that happens, the
tests should rely on the existence of the support to pass.
* js/visual-studio: (23 commits)
git: avoid calling aliased builtins via their dashed form
bin-wrappers: append `.exe` to target paths if necessary
.gitignore: ignore Visual Studio's temporary/generated files
.gitignore: touch up the entries regarding Visual Studio
vcxproj: also link-or-copy builtins
msvc: add a Makefile target to pre-generate the Visual Studio solution
contrib/buildsystems: add a backend for modern Visual Studio versions
contrib/buildsystems: handle options starting with a slash
contrib/buildsystems: also handle -lexpat
contrib/buildsystems: handle libiconv, too
contrib/buildsystems: handle the curl library option
contrib/buildsystems: error out on unknown option
contrib/buildsystems: optionally capture the dry-run in a file
contrib/buildsystems: redirect errors of the dry run into a log file
contrib/buildsystems: ignore gettext stuff
contrib/buildsystems: handle quoted spaces in filenames
contrib/buildsystems: fix misleading error message
contrib/buildsystems: ignore irrelevant files in Generators/
contrib/buildsystems: ignore invalidcontinue.obj
Vcproj.pm: urlencode '<' and '>' when generating VC projects
...
commit 78b2527b69227d244fd9cd61fd1765ef45cbaef1
Merge: 66108df07 f3eda90ff
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Aug 2 12:46:22 2019 -0700
Merge branch 'jc/log-mailmap-flip-defaults' into next
Hotfix for making "git log" use the mailmap by default.
* jc/log-mailmap-flip-defaults:
log: really flip the --mailmap default
commit 620c09e1b686e06c4ddbd5fb153f7ad898bab412
Author: Varun Naik <vcnaik94@gmail.com>
Date: Thu Aug 1 09:09:10 2019 -0700
restore: add test for deleted ita files
`git restore --staged` uses the same machinery as `git checkout HEAD`,
so there should be a similar test case for "restore" as the existing
test case for "checkout" with deleted ita files.
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Varun Naik <vcnaik94@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit ecd72042de7d79c05d8f153e288766c7f88f0b10
Author: Varun Naik <vcnaik94@gmail.com>
Date: Fri Aug 2 09:28:52 2019 -0700
checkout.c: unstage empty deleted ita files
It is possible to delete a committed file from the index and then add it
as intent-to-add. After `git checkout HEAD <pathspec>`, the file should
be identical in the index and HEAD. The command already works correctly
if the file has contents in HEAD. This patch provides the desired
behavior even when the file is empty in HEAD.
`git checkout HEAD <pathspec>` calls tree.c:read_tree_1(), with fn
pointing to checkout.c:update_some(). update_some() creates a new cache
entry but discards it when its mode and oid match those of the old
entry. A cache entry for an ita file and a cache entry for an empty file
have the same oid. Therefore, an empty deleted ita file previously
passed both of these checks, and the new entry was discarded, so the
file remained unchanged in the index. After this fix, if the file is
marked as ita in the cache, then we avoid discarding the new entry and
add the new entry to the cache instead.
This change should not affect newly added ita files. For those, inside
tree.c:read_tree_1(), tree_entry_interesting() returns
entry_not_interesting, so fn is never called.
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Varun Naik <vcnaik94@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit a613d4f8176593e560628b174c3e10cfac3f6d58
Author: Sun Chao <16657101987@163.com>
Date: Thu Aug 1 02:35:44 2019 +0800
pack-refs: always refresh after taking the lock file
When a packed ref is deleted, the whole packed-refs file is
rewritten to omit the ref that no longer exists. However if another
gc command is running and calls `pack-refs --all` simultaneously,
there is a chance that a ref that was just updated lose the newly
created commits.
Through these steps, losing commits on newly updated refs can be
demonstrated:
# step 1: compile git without `USE_NSEC` option
Some kernel releases do enable it by default while some do
not. And if we compile git without `USE_NSEC`, it will be easier
demonstrated by the following steps.
# step 2: setup a repository and add the first commit
git init repo &&
(cd repo &&
git config core.logallrefupdates true &&
git commit --allow-empty -m foo)
# step 3: in one terminal, repack the refs repeatedly
cd repo &&
while true
do
git pack-refs --all
done
# step 4: in another terminal, simultaneously update the
# master with update-ref, and create and delete an
# unrelated ref also with update-ref
cd repo &&
while true
do
us=$(git commit-tree -m foo -p HEAD HEAD^{tree}) &&
git update-ref refs/heads/newbranch $us &&
git update-ref refs/heads/master $us &&
git update-ref -d refs/heads/newbranch &&
them=$(git rev-parse master) &&
if test "$them" != "$us"
then
echo >&2 "lost commit: $us"
exit 1
fi
# eye candy
printf .
done
Though we have the packed-refs lock file and loose refs lock
files to avoid updating conflicts, a ref will lost its newly
commits if racy stat-validity of `packed-refs` file happens
(which is quite same as the racy-git described in
`Documentation/technical/racy-git.txt`), the following
specific set of operations demonstrates the problem:
1. Call `pack-refs --all` to pack all the loose refs to
packed-refs, and let say the modify time of the
packed-refs is DATE_M.
2. Call `update-ref` to update a new commit to master while
it is already packed. the old value (let us call it
OID_A) remains in the packed-refs file and write the new
value (let us call it OID_B) to $GIT_DIR/refs/heads/master.
3. Call `update-ref -d` within the same DATE_M from the 1th
step to delete a different ref newbranch which is packed
in the packed-refs file. It check newbranch's oid from
packed-refs file without locking it.
Meanwhile it keeps a snapshot of the packed-refs file in
memory and record the file's attributes with the snapshot.
The oid of master in the packed-refs's snapshot is OID_A.
4. Call a new `pack-refs --all` to pack the loose refs, the
oid of master in packe-refs file is OID_B, and the loose
refs $GIT_DIR/refs/heads/master is removed. Let's say
the `pack-refs --all` is very quickly done and the new
packed-refs file's modify time is still DATE_M, and it
has the same file size, even the same inode.
5. 3th step now goes on after checking the newbranch, it
begin to rewrite the packed-refs file. After get the
lock file of packed-ref file, it checks it's on-disk
file attributes with the snapshot, suck as the timestamp,
the file size and the inode value. If they are both the
same values, and the snapshot is not refreshed.
Because the loose ref of master is removed by 4th step,
`update-ref -d` will updates the new packed-ref to disk
which contains master with the oid OID_A. So now the
newly commit OID_B of master is lost.
The best path forward is just always refreshing after take
the lock file of `packed-refs` file. Traditionally we avoided
that because refreshing it implied parsing the whole file.
But these days we mmap it, so it really is just an extra
open()/mmap() and a quick read of the header. That doesn't seem
like an outrageous cost to pay when we're already taking the lock.
Signed-off-by: Sun Chao <sunchao9@huawei.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Sun Chao <sunchao9@huawei.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit decfe05bb668771fb25a23021b2b33bc7649cd32
Author: SZEDER Gábor <szeder.dev@gmail.com>
Date: Thu Aug 1 17:53:09 2019 +0200
t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd'
We have a couple of test scripts that are not completely
httpd-specific, but do run a few httpd-specific tests at the end.
These test scripts source 'lib-httpd.sh' somewhere mid-script, which
then skips all the rest of the test script if the dependencies for
running httpd tests are not fulfilled.
As the previous two patches in this series show, already on two
occasions non-httpd-specific tests were appended at the end of such
test scripts, and, consequently, they were skipped as well when httpd
tests couldn't be run.
Add a comment at the end of these test scripts to warn against adding
non-httpd-specific tests at the end, in the hope that they will help
prevent similar issues in the future.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 5aa02f98685d78666293149087d3f69b97528cfb
Author: Jeff King <peff@peff.net>
Date: Wed Jul 31 00:38:25 2019 -0400
tree-walk: harden make_traverse_path() length computations
The make_traverse_path() function isn't very careful about checking its
output buffer boundaries. In fact, it doesn't even _know_ the size of
the buffer it's writing to, and just assumes that the caller used
traverse_path_len() correctly. And even then we assume that our
traverse_info.pathlen components are all correct, and just blindly write
into the buffer.
Let's improve this situation a bit:
- have the caller pass in their allocated buffer length, which we'll
check against our own computations
- check for integer underflow as we do our backwards-insertion of
pathnames into the buffer
- check that we do not run out items in our list to traverse before
we've filled the expected number of bytes
None of these should be triggerable in practice (especially since our
switch to size_t everywhere in a previous commit), but it doesn't hurt
to check our assumptions.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit c43ab062598d0299ea6e0d115a6018189a7793bf
Author: Jeff King <peff@peff.net>
Date: Wed Jul 31 00:38:23 2019 -0400
tree-walk: add a strbuf wrapper for make_traverse_path()
All but one of the callers of make_traverse_path() allocate a new heap
buffer to store the path. Let's give them an easy way to write to a
strbuf, which saves them from computing the length themselves (which is
especially tricky when they want to add to the path). It will also make
it easier for us to change the make_traverse_path() interface in a
future patch to improve its bounds-checking.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit b3b3cbcbf246b1051ad453bc02e24a89573e2911
Author: Jeff King <peff@peff.net>
Date: Wed Jul 31 00:38:20 2019 -0400
tree-walk: accept a raw length for traverse_path_len()
We take a "struct name_entry", but only care about the length of the
path name. Let's just take that length directly, making it easier to use
the function from callers that sometimes do not have a name_entry at
all.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 37806080d7be1ab5b2fa918f6a528652596ea2c1
Author: Jeff King <peff@peff.net>
Date: Wed Jul 31 00:38:18 2019 -0400
tree-walk: use size_t consistently
We store and manipulate the cumulative traverse_info.pathlen as an
"int", which can overflow when we are fed ridiculously long pathnames
(e.g., ones at the edge of 2GB or 4GB, even if the individual tree entry
names are smaller than that). The results can be confusing, though
after some prodding I was not able to use this integer overflow to cause
an under-allocated buffer.
Let's consistently use size_t to generate and store these, and make
sure our addition doesn't overflow.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 7f005b0f483a507d3c7b353f4753ac3fece88bc0
Author: SZEDER Gábor <szeder.dev@gmail.com>
Date: Thu Aug 1 17:53:08 2019 +0200
t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh'
't5703-upload-pack-ref-in-want.sh' sources 'lib-httpd.sh' near the end
to run a couple of httpd-specific tests, but 'lib-httpd.sh' skips all
the rest of the test script if the dependencies for running httpd
tests are not fulfilled. However, the last six tests in 't5703' are
not httpd-specific, but they are skipped as well when httpd tests
can't be run.
Move these six tests earlier in the test script, before 'lib-httpd.sh'
is sourced, so they will be run even when httpd tests aren't. Note
that this is not merely a pure code movement, because the setup test
case for the httpd tests needed an additional 'rm -rf
"$LOCAL_PRISTINE"' to clean up a directory left behind by the moved
non-httpd-specific tests.
Also add a comment at the end of this test script to warn against
adding non-httpd-specific tests at the end, in the hope that it will
help prevent similar issues in the future.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 12b1826609d5c309336ffd9f56e42abaf8d96cef
Author: SZEDER Gábor <szeder.dev@gmail.com>
Date: Thu Aug 1 17:53:07 2019 +0200
t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh'
't5510-fetch.sh' sources 'lib-httpd.sh' near the end to run a
httpd-specific test, but 'lib-httpd.sh' skips all the rest of the test
script if the dependencies for running httpd tests are not fulfilled.
Alas, recently cdbd70c437 (fetch: add --[no-]show-forced-updates
argument, 2019-06-18) appended a non-httpd-specific test at the end,
and this test is then skipped as well when httpd tests can't be run.
Move this new test earlier in the test script, before 'lib-httpd.sh'
is sourced, so it will be run even when httpd tests aren't.
Also add a comment at the end of this test script to warn against
adding non-httpd-specific tests at the end, in the hope that it will
help prevent similar issues in the future.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 66108df07cb19d083b2ca07a23f4bf494216042f
Merge: 26b713c82 51cf31587
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Aug 1 11:32:34 2019 -0700
Sync with master
* master:
RelNotes/2.23.0: fix a few typos and other minor issues
RelNotes/2.21.1: typofix
commit 26b713c82430d90e09e82136d2f06d3c9e5a935c
Merge: 80cddd789 85fe0e800
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Aug 1 11:32:25 2019 -0700
Merge branch 'js/early-config-with-onbranch' into next
The recently added [includeif "onbranch:branch"] feature does not
work well with an early config mechanism, as it attempts to find
out what branch we are on before we even haven't located the git
repository. The inclusion during early config scan is ignored to
work around this issue.
* js/early-config-with-onbranch:
config: work around bug with includeif:onbranch and early config
commit 80cddd7895c67cc745a478270d114e738fe3f549
Merge: c3a02773c 7ed20f596
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Aug 1 09:13:25 2019 -0700
Merge branch 'jc/log-mailmap-flip-defaults' into next
* jc/log-mailmap-flip-defaults:
log: flip the --mailmap default unconditionally
commit c3a02773ca8f78f1813b62f319b3208f4235ec52
Merge: 3aa218347 f36d08d72
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jul 31 14:46:48 2019 -0700
Sync with master
* master:
A few more last-minute fixes
commit 3aa218347cf2b6b839d86f9c4a3119697754baf2
Merge: 449695af8 7ff024e7b
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jul 31 14:46:38 2019 -0700
Merge branch 'jk/repack-silence-auto-bitmap-warning' into next
Squelch unneeded and misleading warnings from "repack" when the
command attempts to generate pack bitmaps without explicitly asked
for by the user.
* jk/repack-silence-auto-bitmap-warning:
repack: simplify handling of auto-bitmaps and .keep files
repack: silence warnings when auto-enabled bitmaps cannot be built
t7700: clean up .keep file in bitmap-writing test
commit 449695af8f9f02bef6530b10c43bfbaef878b85c
Merge: 8637ae9f3 e1e7a7714
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jul 31 14:46:38 2019 -0700
Merge branch 'jk/sort-iter-test-output' into next
* jk/sort-iter-test-output:
t: sort output of hashmap iteration
commit 8637ae9f343e1520a92e9d9116065d6e1e270699
Merge: 4dedae46a 904214009
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jul 31 14:46:38 2019 -0700
Merge branch 'jc/dir-iterator-test-fix' into next
* jc/dir-iterator-test-fix:
test-dir-iterator: do not assume errno values
commit 9055384710dd8963b125f4f87c24d8f67d9fa24f
Author: Jeff King <peff@peff.net>
Date: Wed Jul 31 00:38:15 2019 -0400
tree-walk: drop oid from traverse_info
As the previous commit shows, the presence of an oid in each level of
the traverse_info is confusing and ultimately not necessary. Let's drop
it to make it clear that it will not always be set (as well as convince
us that it's unused, and let the compiler catch any merges with other
branches that do add new uses).
Since the oid is part of name_entry, we'll actually stop embedding a
name_entry entirely, and instead just separately hold the pathname, its
length, and the mode.
This makes the resulting code slightly more verbose as we have to pass
those elements around individually. But it also makes it more clear what
each code path is going to use (and in most of the paths, we really only
care about the pathname itself).
A few of these conversions are noisier than they need to be, as they
also take the opportunity to rename "len" to "namelen" for clarity
(especially where we also have "pathlen" or "ce_len" alongside).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 947208b725188eb499625ebc5c6e43d54c97e4fc
Author: Jeff King <peff@peff.net>
Date: Wed Jul 31 00:38:11 2019 -0400
setup_traverse_info(): stop copying oid
We assume that if setup_traverse_info() is passed a non-empty "base"
string, that string is pointing into a tree object and we can read the
object oid by skipping past the trailing NUL.
As it turns out, this is not true for either of the two calls, and we
may end up reading garbage bytes:
1. In git-merge-tree, our base string is either empty (in which case
we'd never run this code), or it comes from our traverse_path()
helper. The latter overallocates a buffer by the_hash_algo->rawsz
bytes, but then fills it with only make_traverse_path(), leaving
those extra bytes uninitialized (but part of a legitimate heap
buffer).
2. In unpack_trees(), we pass o->prefix, which is some arbitrary
string from the caller. In "git read-tree --prefix=foo", for
instance, it will point to the command-line parameter, and we'll
read 20 bytes past the end of the string.
Interestingly, tools like ASan do not detect (2) because the process
argv is part of a big pre-allocated buffer. So we're reading trash, but
it's trash that's probably part of the next argument, or the
environment.
You can convince it to fail by putting something like this at the
beginning of common-main.c's main() function:
{
int i;
for (i = 0; i < argc; i++)
argv[i] = xstrdup_or_null(argv[i]);
}
That puts the arguments into their own heap buffers, so running:
make SANITIZE=address test
will find problems when "read-tree --prefix" is used (e.g., in t3030).
Doubly interesting, even with the hackery above, this does not fail
prior to ea82b2a085 (tree-walk: store object_id in a separate member,
2019-01-15). That commit switched setup_traverse_info() to actually
copying the hash, rather than simply pointing to it. That pointer was
always pointing to garbage memory, but that commit started actually
dereferencing the bytes, which is what triggers ASan.
That also implies that nobody actually cares about reading these oid
bytes anyway (or at least no path covered by our tests). And manual
inspection of the code backs that up (I'll follow this patch with some
cleanups that show definitively this is the case, but they're quite
invasive, so it's worth doing this fix on its own).
So let's drop the bogus hashcpy(), along with the confusing oversizing
in merge-tree.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 814291cf3f286ddffc291e4820c62ac729e83171
Author: SZEDER Gábor <szeder.dev@gmail.com>
Date: Tue Jul 30 23:29:15 2019 +0200
t5510-fetch: fix negated 'test_i18ngrep' invocation
The test '--no-show-forced-updates' in 't5510-fetch.sh' added in
cdbd70c437 (fetch: add --[no-]show-forced-updates argument,
2019-06-18) runs '! test_i18ngrep ...'. This is wrong, because when
running the test with GIT_TEST_GETTEXT_POISON=true, then
'test_i18ngrep' is basically a noop and always returns with success,
the leading ! turns that into a failure, which then fails the test.
Use 'test_i18ngrep ! ...' instead.
This went unnoticed by our GETTEXT_POISON CI builds, because those
builds don't run this test case: in those builds we don't install
Apache, and this test comes after 't5510' sources 'lib-httpd.sh',
which, consequently, skips all the remaining tests, including this
one.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 6a289d45c0e5d155f536d7c1f73c3b33690e92c6
Author: Matheus Tavares <matheus.bernardino@usp.br>
Date: Tue Jul 30 13:53:27 2019 -0300
grep: fix worktree case in submodules
Running git-grep with --recurse-submodules results in a cached grep for
the submodules even when --cached is not used. This makes all
modifications in submodules' tracked files be always ignored when
grepping. Solve that making git-grep respect the cached option when
invoking grep_cache() inside grep_submodule(). Also, add tests to
ensure that the desired behavior is performed.
Reported-by: Daniel Zaoui <jackdanielz@eyomi.org>
Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit b27ac2361aa03458a5a88c667f91393a85719b35
Merge: d4b9055ce 6002896a8
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Jul 29 17:13:15 2019 -0700
Merge branch 'debian-sid' into debian-experimental
* debian-sid:
debian: new upstream release candidate
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 6002896a816412411a162948ca130e3170248ac6
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Jul 29 17:09:40 2019 -0700
debian: new upstream release candidate
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit b1e6da12e8a6ab39c29d8a88ba3c8b91c08127de
Merge: 9285d92d1 026dd738a
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Jul 29 17:06:58 2019 -0700
Merge tag 'v2.23.0-rc0' into debian-sid
Git 2.23-rc0
commit d4b9055ce460a33001979a83ef39bf9a71279eaa
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Jul 29 17:06:36 2019 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 54242efacb1dccead450629bac2a0a7182389e8a
Merge: 8e432fc6a 4dedae46a
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Jul 29 17:04:45 2019 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
commit 4dedae46a21fbd9d3232915177485ac88f42884f
Merge: d1efaea0e 026dd738a
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jul 29 13:11:16 2019 -0700
Sync with master
* master:
Git 2.23-rc0
Merge fixes made on the 'master' front
commit 8e432fc6ae93501b2574ab7be6664beb3eda3e92
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Jul 29 10:32:37 2019 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 4d275f8f3ec138f467bc98fa3e408e447175c214
Merge: 9fd6cdc6c 0f2c4a37f
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Jul 29 10:30:16 2019 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
commit d1efaea0ec83e3242027afa07c1f1ada3fc30789
Merge: 35ea0d8cb f6c9b474a
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jul 29 09:55:48 2019 -0700
Merge branch 'bc/hash-independent-tests-part-4' into next
Update to the tests to help SHA-256 transition continues.
* bc/hash-independent-tests-part-4:
t2203: avoid hard-coded object ID values
t1710: make hash independent
t1007: remove SHA1 prerequisites
t0090: make test pass with SHA-256
t0027: make hash size independent
t6030: make test work with SHA-256
t5000: make hash independent
t1450: make hash size independent
t1410: make hash size independent
t: add helper to convert object IDs to paths
commit 35ea0d8cba217cc1ccd03448eab5f390973dc54d
Merge: 8081b8c13 81ed2b405
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jul 29 09:55:48 2019 -0700
Merge branch 'cb/xdiff-no-system-includes-in-dot-c' into next
Compilation fix.
* cb/xdiff-no-system-includes-in-dot-c:
xdiff: remove duplicate headers from xpatience.c
xdiff: remove duplicate headers from xhistogram.c
xdiff: drop system includes in xutils.c
commit 8081b8c13daa20afe613af60dc97c688a6b8d007
Merge: bdbcd0e2a 7a06fb038
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jul 29 09:55:48 2019 -0700
Merge branch 'jk/no-system-includes-in-dot-c' into next
Compilation fix.
* jk/no-system-includes-in-dot-c:
wt-status.h: drop stdio.h include
verify-tag: drop signal.h include
commit bdbcd0e2a533d751c683c23a57cdb52bf931c5ac
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jul 29 09:24:27 2019 -0700
Revert "Merge branch 'ab/no-kwset' into next"
This reverts commit ed0479ce3d908f5806af0a70d2c64638e371533a, reversing
changes made to b847d206edd53c776da05868c0ee2f4420903a1e. The use of
pcre engine for the fixed-string codepath without semantic change is
a sensible goal, but the current topic is still premature to achieve
that yet.
commit 0f2c4a37fdba75d06ae7254c4b30ed7739985214
Merge: 3d9cedf47 3034dab9e
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jul 25 14:35:47 2019 -0700
Sync with master
* master:
Flush fixes up to the third batch post 2.22.0
The seventh batch
commit 3d9cedf47006c0b7c8139bcff3723853b91aac12
Merge: b2944a0ba 80dfc9242
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jul 25 14:02:29 2019 -0700
Merge branch 'js/rebase-cleanup' into next
A few leftover cleanup to "git rebase" in C.
* js/rebase-cleanup:
git: mark cmd_rebase as requiring a worktree
rebase: fix white-space
commit b2944a0ba6142c44f385c2603319a0f009e9e21a
Merge: e3d546eb1 b777f3fd6
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jul 25 14:02:29 2019 -0700
Merge branch 'jk/xdiff-clamp-funcname-context-index' into next
The internal diff machinery can be made to read out of bounds while
looking for --funcion-context line in a corner case, which has been
corrected.
* jk/xdiff-clamp-funcname-context-index:
xdiff: clamp function context indices in post-image
commit e3d546eb158e130142095e3486c7141c67ad88c9
Merge: 8bd5a6861 fb9d7431c
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jul 25 14:02:28 2019 -0700
Merge branch 'sg/travis-gcc-4.8' into next
Add a job to build with a tad older GCC to make sure we are still
buildable.
* sg/travis-gcc-4.8:
travis-ci: build with GCC 4.8 as well
commit 8bd5a6861831c9ca02f9bd5352920f3c8b365cc9
Merge: edc849c7d f00253278
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jul 23 15:31:41 2019 -0700
Merge branch 'bb/grep-pcre2-bug-message-fix' into next
BUG() message fix.
* bb/grep-pcre2-bug-message-fix:
grep: print the pcre2_jit_on value
commit edc849c7ddc7041c5eba084a6d94f6602eaeec1b
Merge: 102302147 70b39fbed
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jul 23 10:47:35 2019 -0700
Merge branch 'jk/test-commit-bulk' into next
A test helper has been introduced to optimize preparation of test
repositories with many simple commits, and a handful of test
scripts have been updated to use it.
* jk/test-commit-bulk:
t6200: use test_commit_bulk
t5703: use test_commit_bulk
t5702: use test_commit_bulk
t3311: use test_commit_bulk
t5310: increase the number of bitmapped commits
test-lib: introduce test_commit_bulk
commit 9fd6cdc6c98a876c5d89a5d2a7dccd365aa4771a
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Jul 22 10:26:05 2019 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit c9ead2c1cd564ad114bbca998faa6b3d7bee2e50
Merge: d3c3920fc 102302147
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Jul 22 10:22:58 2019 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
commit 102302147b47505b8667bbd7a42e242728b3a860
Merge: 339470d82 9c9b961d7
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Jul 19 11:37:46 2019 -0700
Sync with master
* master:
The sixth batch
commit 339470d824ad90617bd7e3f60ac265348aff1991
Merge: 12f7e5d41 7926cee90
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Jul 19 11:07:09 2019 -0700
Merge branch 'di/readme-markup-fix' into next
Docfix.
* di/readme-markup-fix:
README: fix rendering of text in angle brackets
commit 12f7e5d413ad55845adb991980d72d0834819f63
Merge: b7da0a821 b2b1f615c
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Jul 19 11:07:08 2019 -0700
Merge branch 'jc/denoise-rm-to-resolve' into next
"git rm" to resolve a conflicted path leaked an internal message
"needs merge" before actually removing the path, which was
confusing. This has been corrected.
* jc/denoise-rm-to-resolve:
rm: resolving by removal is not a warning-worthy event
commit b7da0a821c7d10dcddf75571ee3951434b81b658
Merge: d4ae24a93 b09364c47
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Jul 19 11:07:08 2019 -0700
Merge branch 'js/clean-report-too-long-a-path' into next
"git clean" silently skipped a path when it cannot lstat() it; now
it gives a warning.
* js/clean-report-too-long-a-path:
clean: show an error message when the path is too long
commit d4ae24a9391c45f06b096df5183dda0b1a90f402
Merge: 5d38aa123 b932f6a5e
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Jul 19 11:07:08 2019 -0700
Merge branch 'tg/stash-keep-index-with-removed-paths' into next
"git stash --keep-index" did not work correctly on paths that have
been removed, which has been fixed.
* tg/stash-keep-index-with-removed-paths:
stash: fix handling removed files with --keep-index
commit 5d38aa12366480efa25ddef63ae5cd177026dd4f
Merge: 33dd6d040 64c45dc72
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Jul 19 11:07:07 2019 -0700
Merge branch 'sr/gpg-interface-stop-at-the-end' into next
A codepath that reads from GPG for signed object verification read
past the end of allocated buffer, which has been fixed.
* sr/gpg-interface-stop-at-the-end:
gpg-interface: do not scan past the end of buffer
commit 33dd6d0401adb9fff3f105143f56181d8643247b
Merge: 8acd58e18 eb7c78631
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Jul 19 11:07:07 2019 -0700
Merge branch 'js/mingw-spawn-with-spaces-in-path' into next
Window 7 update ;-)
* js/mingw-spawn-with-spaces-in-path:
mingw: support spawning programs containing spaces in their names
commit 8acd58e189e3b48b1c2053f0b74909b0b561c105
Merge: 2ebb586ce cc0c42975
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Jul 19 11:07:07 2019 -0700
Merge branch 'jc/post-c89-rules-doc' into next
We have been trying out a few language features outside c89; the
coding guidelines document did not talk about them and instead had
a blanket ban against them.
* jc/post-c89-rules-doc:
CodingGuidelines: spell out post-C89 rules
![[bug history graph]](https://qa.debian.org/data/bts/graphs/g/git.png){kind=link}