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 7d4d971606c42a87fa66126fe0564bb677909ad4
Merge: 2005a8dc3e 90b02d0250
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Jul 27 11:09:56 2020 -0700
Merge branch 'debian-sid' into debian-experimental
* debian-sid:
debian: new upstream release
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: Ibc05f71eb1ac021bb5df5604c9e94a2a2b5e7f13
commit 2005a8dc3eb704fac0d3ad828b281123fca7faa2
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Jul 27 11:07:48 2020 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: If0c08781adb6add1d873e27a8ccc379adae57280
commit 226187055f1e58d637420947cf77e64f0cf0d6fe
Merge: 4856b8be7a 6104cc2f0b
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Jul 27 11:05:13 2020 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: I3e20958ea75abbf092fda384e3def562a3a38a18
commit 90b02d025097bdf0bf0ef44d5053eefcec1538b5
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Jul 27 11:02:46 2020 -0700
debian: new upstream release
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit cf81b190fefa7227411583628a43b3d015b8842b
Merge: 9c11f6ec3b 47ae905ffb
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Jul 27 10:57:01 2020 -0700
Merge tag 'v2.28.0' into debian-sid
Git 2.28.0
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 6104cc2f0b60537336b3f2ee6fc82132e2b84cd3
Merge: 9e8e572cab 47ae905ffb
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Jul 26 18:04:17 2020 -0700
Sync with 2.28
commit 9e8e572cabea730c3383d40a2bb79edd8d7b0030
Merge: bb35597a00 5c06d60fc5
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Jul 26 09:52:43 2020 -0700
Sync with l10n update
* master:
l10n: es: 2.28.0 round 1
l10n: de.po: Update German translation for Git v2.28.0
l10n: de.po: fix grammar
l10n: zh_CN: for git v2.28.0 l10n round 1
l10n: zh_TW.po: v2.28.0 round 1 (0 untranslated)
l10n: vi.po: correct "ident line" translation
l10n: vi.po(4931t): Updated translation for v2.28.0
l10n: fr v2.28.0 round 1
l10n: sv.po: Update Swedish translation (4931t0f0u)
l10n: it.po: update the Italian translation for Git 2.28.0 round 1
l10n: tr: v2.28.0 round 1
l10n: git.pot: v2.28.0 round 1 (70 new, 14 removed)
l10n: Update Catalan translation
commit bb35597a00a770230f07530d7a826571d0149c33
Merge: 4e02568307 418cca9555
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Jul 24 15:55:41 2020 -0700
Sync with master
commit 4e02568307e449db3ef1899f1a62bfe8bd3f1d21
Merge: d0b3904b26 6c18d03eb8
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Jul 24 14:01:34 2020 -0700
Merge branch 'ps/ref-transaction-hook' into next
A new hook.
* ps/ref-transaction-hook:
githooks.txt: use correct "reference-transaction" hook name
commit 4856b8be7a7092a1b715339ac7e714dc7d9d174e
Merge: a15fe123a6 9c11f6ec3b
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed Jul 22 17:55:34 2020 -0700
Merge branch 'debian-sid' into debian-experimental
* debian-sid:
debian: new upstream release candidate
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: If211097de715aa26b33661db6fd7b059c31a87ce
commit a15fe123a6bb2de655bf5e27499ad26c51d544f6
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed Jul 22 17:54:02 2020 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: I94b921a3cbb799b3a0e1573504b588b3b3720c42
commit feade1fe0c0673eca4b09330038778b092761112
Merge: 0b61854710 d0b3904b26
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed Jul 22 17:51:59 2020 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: I69b20f4f402969514e3ecdbf762d5277316c9894
commit 9c11f6ec3b284ce938f51c42a49b2eda512371da
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed Jul 22 17:45:36 2020 -0700
debian: new upstream release candidate
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit ed4458cde6f03f2f382615ec7d76931b6f7129e9
Merge: 2e83eb1e3e b066807397
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed Jul 22 17:36:27 2020 -0700
Merge tag 'v2.28.0-rc2' into debian-sid
Git 2.28-rc2
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit d0b3904b262b6e684ce8809fb0c4506af2876916
Merge: 839af2c268 3d20111cbd
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jul 22 14:21:22 2020 -0700
Sync with master
commit 839af2c2686bba67b3e8cea649583ed99b2326e6
Merge: 63662d6646 b066807397
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jul 22 09:35:06 2020 -0700
Sync with 2.28-rc2
commit 63662d6646cad397df9e395b20d177535f3ea34e
Merge: 2e6466060c cada7308ad
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jul 22 09:34:31 2020 -0700
Merge branch 'en/fill-directory-exponential' into next
Fix to a regression introduced during 2.27 cycle.
* en/fill-directory-exponential:
dir: check pathspecs before returning `path_excluded`
commit 2e6466060c836a9f3ca3ed8c6f7c89eb2587f336
Merge: c17007237a cfa7ae8b6e
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jul 21 14:20:54 2020 -0700
Sync with master
commit c17007237aae6fedbf50173f610fc49778259b94
Merge: fd7bb5c85e 9b906af657
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jul 21 14:20:29 2020 -0700
Merge branch 'ct/mv-unmerged-path-error' into next
"git mv src dst", when src is an unmerged path, errored out
correctly but with an incorrect error message to claim that src is
not tracked, which has been clarified.
* ct/mv-unmerged-path-error:
git-mv: improve error message for conflicted file
commit fd7bb5c85e2c3b4c242c54933164125776d3460c
Merge: e7c4b8f9ae cd85b447bf
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jul 21 14:20:28 2020 -0700
Merge branch 'bc/push-cas-cquoted-refname' into next
Pushing a ref whose name contains non-ASCII character with the
"--force-with-lease" option did not work over smart HTTP protocol,
which has been corrected.
* bc/push-cas-cquoted-refname:
remote-curl: make --force-with-lease work with non-ASCII ref names
commit e7c4b8f9ae14e88faa25f5fcacd07b357d500903
Merge: 617fe6aecc b6839fda68
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jul 20 21:19:33 2020 -0700
Merge branch 'cc/pretty-contents-size' into next
"git for-each-ref --format=<>" learned %(contents:size).
* cc/pretty-contents-size:
ref-filter: add support for %(contents:size)
t6300: test refs pointing to tree and blob
Documentation: clarify %(contents:XXXX) doc
commit 617fe6aecce2161433d263e4028c09dfeb1acb3e
Merge: 28e85288e5 a98f7fb366
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jul 20 21:19:33 2020 -0700
Merge branch 'rs/add-index-entry-optim-fix' into next
Fix to an ancient bug caused by an over-eager attempt for
optimization.
* rs/add-index-entry-optim-fix:
read-cache: remove bogus shortcut
commit 28e85288e520170405d3e5374a12def90a9533c7
Merge: bd4a9946a6 77aa0941ce
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jul 20 21:19:33 2020 -0700
Merge branch 'jt/avoid-lazy-fetching-upon-have-check' into next
Fetching from a lazily cloned repository resulted at the server
side in attempts to lazy fetch objects that the client side has,
many of which will not be available from the third-party anyway.
* jt/avoid-lazy-fetching-upon-have-check:
upload-pack: do not lazy-fetch "have" objects
commit bd4a9946a6645c2433030d92730eedd943fa51a0
Merge: 6aa5c12b74 6a67c75948
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jul 20 21:19:33 2020 -0700
Merge branch 'dl/test-must-fail-fixes-6' into next
Dev support to limit the use of test_must_fail to only git commands.
* dl/test-must-fail-fixes-6:
test-lib-functions: restrict test_must_fail usage
t9400: don't use test_must_fail with cvs
t9834: remove use of `test_might_fail p4`
t7107: don't use test_must_fail()
t5324: reorder `run_with_limited_open_files test_might_fail`
t3701: stop using `env` in force_color()
commit 6aa5c12b74324bd1f80b8e09191c560aab33a5fb
Merge: bf02f909fa e8882a87d9
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jul 20 21:19:31 2020 -0700
Merge branch 'en/sparse-status' into next
Fix to a "git prompt" regression during this development cycle.
* en/sparse-status:
git-prompt: change == to = for zsh's sake
commit cd85b447bfc09ddfab660048883de6a07d893097
Author: brian m. carlson <sandals@crustytoothpaste.net>
Date: Tue Jul 21 01:15:11 2020 +0000
remote-curl: make --force-with-lease work with non-ASCII ref names
When we invoke a remote transport helper and pass an option with an
argument, we quote the argument as a C-style string if necessary. This
is the case for the cas option, which implements the --force-with-lease
command-line flag, when we're passing a non-ASCII refname.
However, the remote curl helper isn't designed to parse such an
argument, meaning that if we try to use --force-with-lease with an HTTP
push and a non-ASCII refname, we get an error like this:
error: cannot parse expected object name '0000000000000000000000000000000000000000"'
Note the double quote, which get_oid has reminded us is not valid in an
hex object ID.
Even if we had been able to parse it, we would send the wrong data to
the server: we'd send an escaped ref, which would not behave as the user
wanted and might accidentally result in updating or deleting a ref we
hadn't intended.
Since we need to expect a quoted C-style string here, just check if the
first argument is a double quote, and if so, unquote it. Note that if
the refname contains a double quote, then we will have double-quoted it
already, so there is no ambiguity.
We test for this case only in the smart protocol, since the DAV-based
protocol is not capable of handling this capability. We use UTF-8
because this is nicer in our tests and friendlier to Windows, but the
code should work for all non-ASCII refs.
While we're at it, since the name of the option is now well established
and isn't going to change, let's inline it instead of using the #define
constant.
Reported-by: Frej Bjon <frej.bjon@nemit.fi>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 9b906af657d4ec0bc8fc01c5cbbbddb582a8cac6
Author: Chris Torek <chris.torek@gmail.com>
Date: Mon Jul 20 06:17:52 2020 +0000
git-mv: improve error message for conflicted file
'git mv' has always complained about renaming a conflicted
file, as it cannot handle multiple index entries for one file.
However, the error message it uses has been the same as the
one for an untracked file:
fatal: not under version control, src=...
which is patently wrong. Distinguish the two cases and
add a test to make sure we produce the correct message.
Signed-off-by: Chris Torek <chris.torek@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit bf02f909fab9e411c5aaefa5111b14ff17dd2449
Merge: d6b33fda9d e7ae437ac1
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jul 20 13:32:00 2020 -0700
Sync with master
* master:
git-gui: allow opening work trees from the startup dialog
commit cada7308ade0b9a018f9c54ea3f226e2e9c39ee5
Author: Martin Ågren <martin.agren@gmail.com>
Date: Mon Jul 20 20:45:29 2020 +0200
dir: check pathspecs before returning `path_excluded`
In 95c11ecc73 ("Fix error-prone fill_directory() API; make it only
return matches", 2020-04-01), we taught `fill_directory()`, or more
specifically `treat_path()`, to check against any pathspecs so that we
could simplify the callers.
But in doing so, we added a slightly-too-early return for the "excluded"
case. We end up not checking the pathspecs, meaning we return
`path_excluded` when maybe we should return `path_none`. As a result,
`git status --ignored -- pathspec` might show paths that don't actually
match "pathspec".
Move the "excluded" check down to after we've checked any pathspecs.
Reported-by: Andreas Schwab <schwab@linux-m68k.org>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit d6b33fda9dd1696d7d89f79efa96a536bc56a556
Merge: 942efa1f99 ae46588be0
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat Jul 18 16:40:06 2020 -0700
Sync with master
commit 942efa1f998baaf5968082c9b7bad873998b1568
Merge: bb6ee9441b d223e85407
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat Jul 18 14:12:58 2020 -0700
Merge branch 'dl/branch-cleanup' into next
Code clean-up around "git branch" with a minor bugfix.
* dl/branch-cleanup:
t3200: don't grep for `strerror()` string
commit bb6ee9441b427e541ee2391995cef6929dfef276
Merge: 4e03396489 ca8bb509d2
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat Jul 18 14:12:57 2020 -0700
Merge branch 'js/pu-to-seen' into next
The documentation and some tests have been adjusted for the recent
renaming of "pu" branch to "seen".
* js/pu-to-seen:
gitworkflows.txt: fix broken subsection underline
commit 4e03396489503f2eef3d86331dc211e2d8c46ecf
Merge: e9626dbbb9 1e1a30b64a
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat Jul 18 14:12:57 2020 -0700
Merge branch 'jc/relnotes-v0-extension-update' into next
* jc/relnotes-v0-extension-update:
RelNotes: update the v0 with extension situation
commit 0b6185471072bba8ec5fd094f84c33daf1fdd4a4
Merge: 99e4cc8e58 2e83eb1e3e
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri Jul 17 18:54:36 2020 -0700
Merge branch 'debian-sid' into debian-experimental
* debian-sid:
debian: new upstream release candidate
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: I73f5fdbd1b484fb5e71199620dd19c17630c86d5
commit 99e4cc8e58f3bf26ffbe2a6f2ab6615b889b5dc0
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri Jul 17 18:53:05 2020 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: I6308de03d31296e825f7e15ae7bd512faaaea116
commit 1f72101c517125bff6e36e4ad857c9727e908af1
Merge: 5352f983fc e9626dbbb9
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri Jul 17 18:49:25 2020 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: I24434cc0eba1121bba814b945ccaddc6b7409f9d
commit 2e83eb1e3e780a80259f61723ad392da7d55d818
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri Jul 17 18:41:40 2020 -0700
debian: new upstream release candidate
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 88fcf7ffe9432b54fb28494c38366e2c7364f154
Merge: b6f77a3afb 3ddac3d691
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Fri Jul 17 18:40:13 2020 -0700
Merge tag 'v2.28.0-rc1' into debian-sid
Git 2.28-rc1
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 5352f983fcfb5f0c1a1e866a1ed80bda48aba11c
Author: Josh Steadmon <steadmon@google.com>
Date: Fri Jul 17 12:38:05 2020 -0700
debian: new "next" snapshot
Signed-off-by: Josh Steadmon <steadmon@google.com>
Change-Id: I5a7eb488cbddb4e3c3f2fabb94a1888c88ed1de3
commit 276eed9b3d5a7b06fd92b2095f1c9ee6c263dff0
Merge: 053548eaee 3c755180ce
Author: Josh Steadmon <steadmon@google.com>
Date: Fri Jul 17 12:37:42 2020 -0700
Merge branch 'next' into debian-experimental
Signed-off-by: Josh Steadmon <steadmon@google.com>
Change-Id: I23d58d14f8142bad1dcaf49e02aba0ada1c00550
commit e9626dbbb9f67ffc980796cf6c53668995ad2dcc
Merge: 3c755180ce 3ddac3d691
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jul 16 18:06:32 2020 -0700
Sync with 2.28-rc1
commit 3c755180ce7daeac8cb7f08b237aff8c51881f66
Merge: 85f634d5a6 ec91ffca04
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jul 16 15:40:53 2020 -0700
Merge branch 'jk/reject-newer-extensions-in-v0' into next
commit 85f634d5a6a972c5a89293a1aca2a0a727cb6315
Merge: 2c69e97b92 ec91ffca04
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jul 16 15:40:53 2020 -0700
Merge branch 'jn/v0-with-extensions-fix' into next
In 2.28-rc0, we corrected a bug that some repository extensions are
honored by mistake even in a version 0 repositories (these
configuration variables in extensions.* namespace were supposed to
have special meaning in repositories whose version numbers are 1 or
higher), but this was a bit too big a change.
Under discussion.
* jn/v0-with-extensions-fix:
verify_repository_format(): complain about new extensions in v0 repo
repository: allow repository format upgrade with extensions
Revert "check_repository_format_gently(): refuse extensions for old repositories"
commit 77aa0941ce8ac2dc0027f85e0c79632034cd47f0
Author: Jonathan Tan <jonathantanmy@google.com>
Date: Thu Jul 16 11:09:50 2020 -0700
upload-pack: do not lazy-fetch "have" objects
When upload-pack receives a request containing "have" hashes, it (among
other things) checks if the served repository has the corresponding
objects. However, it does not do so with the
OBJECT_INFO_SKIP_FETCH_OBJECT flag, so if serving a partial clone, a
lazy fetch will be triggered first.
This was discovered at $DAYJOB when a user fetched from a partial clone
(into another partial clone - although this would also happen if the
repo to be fetched into is not a partial clone).
Therefore, whenever "have" hashes are checked for existence, pass the
OBJECT_INFO_SKIP_FETCH_OBJECT flag. Also add the OBJECT_INFO_QUICK flag
to improve performance, as it is typical that such objects do not exist
in the serving repo, and the consequences of a false negative are minor
(usually, a slightly larger pack sent).
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 2c69e97b9229b46d90b595a53cc00165185486d1
Merge: c7877b767d 180a4d76ac
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jul 16 13:28:03 2020 -0700
Merge branch 'jk/tests-timestamp-fix' into next
The test framework has been updated so that most tests will run
with predictable (artificial) timestamps.
* jk/tests-timestamp-fix:
t9100: stop depending on commit timestamps
commit b6839fda6809b1de8d528837dfc99d0837f77c9d
Author: Christian Couder <christian.couder@gmail.com>
Date: Thu Jul 16 14:19:40 2020 +0200
ref-filter: add support for %(contents:size)
It's useful and efficient to be able to get the size of the
contents directly without having to pipe through `wc -c`.
Also the result of the following:
`git for-each-ref --format='%(contents)' refs/heads/my-branch | wc -c`
is off by one as `git for-each-ref` appends a newline character
after the contents, which can be seen by comparing its output
with the output from `git cat-file`.
As with %(contents), %(contents:size) is silently ignored, if a
ref points to something other than a commit or a tag:
```
$ git update-ref refs/mytrees/first HEAD^{tree}
$ git for-each-ref --format='%(contents)' refs/mytrees/first
$ git for-each-ref --format='%(contents:size)' refs/mytrees/first
```
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit a98f7fb36679a98caa0b804d567b6b2fa8f8ef41
Author: René Scharfe <l.s.r@web.de>
Date: Thu Jul 16 19:11:48 2020 +0200
read-cache: remove bogus shortcut
has_dir_name() has some optimizations for the case where entries are
added to an index in the correct order. They kick in if the new entry
sorts after the last one. One of them exits early if the last entry has
a longer name than the directory of the new entry. Here's its comment:
/*
* The directory prefix lines up with part of
* a longer file or directory name, but sorts
* after it, so this sub-directory cannot
* collide with a file.
*
* last: xxx/yy-file (because '-' sorts before '/')
* this: xxx/yy/abc
*/
However, a file named xxx/yy would be sorted before xxx/yy-file because
'-' sorts after NUL, so the length check against the last entry is not
sufficient to rule out a collision. Remove it.
Reported-by: SZEDER Gábor <szeder.dev@gmail.com>
Suggested-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit ec91ffca0455e1a8a0525fb2a10814447d80c456
Author: Jeff King <peff@peff.net>
Date: Thu Jul 16 08:25:13 2020 -0400
verify_repository_format(): complain about new extensions in v0 repo
We made the mistake in the past of respecting extensions.* even when the
repository format version was set to 0. This is bad because forgetting
to bump the repository version means that older versions of Git (which
do not know about our extensions) won't complain. I.e., it's not a
problem in itself, but it means your repository is in a state which does
not give you the protection you think you're getting from older
versions.
For compatibility reasons, we are stuck with that decision for existing
extensions. However, we'd prefer not to extend the damage further. We
can do that by catching any newly-added extensions and complaining about
the repository format.
Note that this is a pretty heavy hammer: we'll refuse to work with the
repository at all. A lesser option would be to ignore (possibly with a
warning) any new extensions. But because of the way the extensions are
handled, that puts the burden on each new extension that is added to
remember to "undo" itself (because they are handled before we know
for sure whether we are in a v1 repo or not, since we don't insist on a
particular ordering of config entries).
So one option would be to rewrite that handling to record any new
extensions (and their values) during the config parse, and then only
after proceed to handle new ones only if we're in a v1 repository. But
I'm not sure if it's worth the trouble:
- ignoring extensions is likely to end up with broken results anyway
(e.g., ignoring a proposed objectformat extension means parsing any
object data is likely to encounter errors)
- this is a sign that whatever tool wrote the extension field is
broken. We may be better off notifying immediately and forcefully so
that such tools don't even appear to work accidentally.
The only downside is that fixing the situation is a little tricky,
because programs like "git config" won't want to work with the
repository. But:
git config --file=.git/config core.repositoryformatversion 1
should still suffice.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit c7877b767dfeeb853637a80ffad05bd6b925e83e
Merge: d97ae59198 b6a658bd00
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jul 15 16:31:44 2020 -0700
Sync with master
* master:
Hopefully the last batch before -rc1
commit d97ae59198f5cb13477f49f61ba9cd6e37465622
Merge: 041807cbbd 862aead24e
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jul 15 14:29:47 2020 -0700
Merge branch 'tb/commit-graph-no-check-oids' into next
Fix to the code to produce progress bar, which is new in the
upcoming release.
* tb/commit-graph-no-check-oids:
commit-graph: fix "Collecting commits from input" progress line
commit 041807cbbda8aced8c3f637627bef874d6f5bca1
Merge: e524883fec 78b76d310f
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jul 15 14:29:47 2020 -0700
Merge branch 'ct/diff-with-merge-base-clarification' into next
Doc update.
* ct/diff-with-merge-base-clarification:
git-diff.txt: reorder possible usages
git-diff.txt: don't mark required argument as optional
commit 180a4d76ac8f7c3e97be023e5943f719f3efb55b
Author: Jeff King <peff@peff.net>
Date: Wed Jul 15 03:42:50 2020 -0400
t9100: stop depending on commit timestamps
An earlier "fix" to this script gave up updating it not to rely on
the current time because we cannot control what timestamp subversion
gives its commits. We however could solve the issue in a different
way and still use deterministic timestamps on Git commits.
One fix would be to sort the list of trees before removing duplicates,
but that loses information:
- we do care that the fetched history is in the same order
- there's a tree which appears twice in the history, and we'd want to
make sure that it's there both times
So instead, let's de-duplicate using a hash (preserving the order), and
drop only lines with identical trees and subjects (preserving the tree
which appears twice, since it has different subjects each time).
Signed-off-by: Jeff King <peff@peff.net>
Acked-by: Eric Wong <e@80x24.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit e524883fec8c33152bc899340ad492df4f195bd9
Merge: a52b5ce7ab 523fa69c36
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jul 14 14:44:09 2020 -0700
Merge branch 'hn/reftable' into next
Preliminary clean-up of the refs API in preparation for adding a
new refs backend "reftable".
* hn/reftable:
reflog: cleanse messages in the refs.c layer
bisect: treat BISECT_HEAD as a pseudo ref
t3432: use git-reflog to inspect the reflog for HEAD
lib-t6000.sh: write tag using git-update-ref
commit a52b5ce7ab350cf85f8fdaf1457cfe648f3832e9
Merge: f1104dfb77 dfaa209a79
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jul 14 14:44:08 2020 -0700
Merge branch 'bw/fail-cloning-into-non-empty' into next
"git clone --separate-git-dir=$elsewhere" used to stomp on the
contents of the existing directory $elsewhere, which has been
taught to fail when $elsewhere is not an empty directory.
* bw/fail-cloning-into-non-empty:
git clone: don't clone into non-empty directory
commit f1104dfb778a17b0aef7818890bd102319d656fe
Merge: 66ee0e6b45 bea866587c
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jul 14 14:44:08 2020 -0700
Merge branch 'pb/log-rev-list-doc' into next
"git help log" has been enhanced by sharing more material from the
documentation for the underlying "git rev-list" command.
* pb/log-rev-list-doc:
git-log.txt: include rev-list-description.txt
git-rev-list.txt: move description to separate file
git-rev-list.txt: tweak wording in set operations
git-rev-list.txt: fix Asciidoc syntax
revisions.txt: describe 'rev1 rev2 ...' meaning for ranges
git-log.txt: add links to 'rev-list' and 'diff' docs
commit 66ee0e6b455c605435745b32c814d266078ad916
Merge: f9edc3c819 f2e3937d94
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jul 14 14:44:08 2020 -0700
Merge branch 'jk/tests-timestamp-fix' into next
The test framework has been updated so that most tests will run
with predictable (artificial) timestamps.
* jk/tests-timestamp-fix:
test-lib: set deterministic default author/committer date
t9100: explicitly unset GIT_COMMITTER_DATE
t5539: make timestamp requirements more explicit
t9700: loosen ident timezone regex
commit f2e3937d94c0859c8616861b1d6c87e4efe0790d
Author: Jeff King <peff@peff.net>
Date: Thu Jul 9 16:42:04 2020 -0400
test-lib: set deterministic default author/committer date
We always set the name and email for committer and author idents to make
the test suite more deterministic, but not timestamps. Many scripts use
test_tick to get consistent and sensibly incrementing timestamps as they
create commits. But other scripts don't particularly care about the
timestamp, and are happy to use whatever the current system time is.
This non-determinism can be annoying:
- when debugging a test, comparing results between two runs can be
difficult, because the commit ids change
- this can sometimes cause tests to be racy. E.g., traversal order
depends on timestamp order. Even in a well-ordered set of commands,
because our timestamp granularity is one second, two commits might
sometimes have the same timestamp and sometimes differ.
Let's set a default timestamp for all scripts to use. Any that use
test_tick already will be unaffected (because their first test_tick call
will overwrite our default), but it will make things a bit more
deterministic for those that don't.
We should be able to choose any time we want here. I picked this one
because:
- it differs from the initial test_tick default, which may make it
easier to distinguish when debugging tests. I picked "April 1st
13:14:15" in the hope that it might stand out.
- it's slightly before the test_tick default. Some tests create some
commits before the first call to test_tick, so using an older
timestamps for those makes sense chronologically. Note that this
isn't how things currently work (where system times are usually more
recent than test_tick), but that also allows us to flush out a few
hidden timestamp dependencies (like the one recently fixed in
t5539).
- we could likewise pick any timezone we want. Choosing +0000 would
have required fixing up fewer tests, but we're more likely to turn
up interesting cases by not matching $TZ exactly. And since
test_tick already checks "-0700", let's try something in the "+"
zone range for variety.
It's possible that the non-deterministic times could help flush out bugs
(e.g., if something broke when the clock flipped over to 2021, our test
suite would let us know). But historically that hasn't been the case;
all time-dependent outcomes we've seen turned out to be accidentally
flaky tests (which we fixed by using test_tick). If we do want to cover
handling the current time, we should dedicate one script to doing so,
and have it unset GIT_COMMITTER_DATE explicitly.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 96ac26fd056b175a9ac36cccc07da2906a15cc5d
Author: Jeff King <peff@peff.net>
Date: Tue Jul 14 08:31:42 2020 -0400
t9100: explicitly unset GIT_COMMITTER_DATE
The early part of t9100 creates an unusual "doubled" history in the
"git-svn" ref. When we get to t9100.17, it looks like this:
$ git log --oneline --graph git-svn
[...]
* efd0303 detect node change from file to directory #2
|\
* | 3e727c0 detect node change from file to directory #2
|/
* 3b00468 try a deep --rmdir with a commit
|\
* | b4832d8 try a deep --rmdir with a commit
|/
* f0d7bd5 import for git svn
Each commit we make with "git commit" is paired with one from "git svn
set-tree", with the latter as a merge of the first and its grandparent.
Later, t9100.17 wants to check that "git svn fetch" gets the same trees.
And it does, but just one copy of each. So it uses rev-list to get the
tree of each commit and pipes it to "uniq" to drop the duplicates. Our
input isn't sorted, but it will find adjacent duplicates. This works
reliably because the order of commits from rev-list always shows the
duplicates next to each other. For any one of those merges, we could
choose to show its duplicate or the grandparent first. But barring
clocks running backwards, the duplicate will always have a time equal to
or greater than the grandparent. Even if equal, we break ties by showing
the first-parent first, so the duplicates remain adjacent.
But this would break if the timestamps stopped moving in chronological
order. Normally we would rely on test_tick for this, but we have _two_
sources of time here:
- "git commit" creates one commit based on GIT_COMMITTER_DATE (which
respects test_tick)
- the "svn set-tree" one is based on subversion, which does not have
an easy way to specify a timestamp
So using test_tick actually breaks the test, because now the duplicates
are far in the past, and we'll show the grandparent before the
duplicate. And likewise, a proposed change to set GIT_COMMITTER_DATE in
all scripts will break it.
We _could_ fix this by sorting before removing duplicates, but
presumably it's a useful part of the test to make sure the trees appear
in the same order in both spots. Likewise, we could use something like:
perl -ne 'print unless $seen{$_}++'
to remove duplicates without impacting the order. But that doesn't work
either, because there are actually multiple (non-duplicate) commits with
the same trees (we change a file mode and then change it back). So we'd
actually have to de-duplicate the combination of subject and tree. Which
then further throws off t9100.18, which compares the tree hashes
exactly; we'd have to strip the result back down.
Since this test _isn't_ buggy, the simplest thing is to just work around
the proposed change by documenting our expectation that git-created
commits are correctly interleaved using the current time.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 053548eaeef1afd9559b0e438b908a3cb28b2d3b
Merge: fe90db8988 b6f77a3afb
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Jul 13 15:10:03 2020 -0700
Merge branch 'debian-sid' into debian-experimental
* debian-sid:
debian: new upstream release candidate
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: Id4ad47fc7a89d9fae2f1f18bff75e415e78a7b39
commit b6f77a3afbb02dbd2d5bd820cc24467108727a4a
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Jul 13 15:04:28 2020 -0700
debian: new upstream release candidate
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 7ff9df0090ac70c4378f83b3bb9741ff5cc05cbe
Merge: b60ea80df2 bd42bbe1a4
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Mon Jul 13 15:02:55 2020 -0700
Merge tag 'v2.28.0-rc0' into debian-sid
Git 2.28-rc0
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 523fa69c36744ae6779e38614cb9bfb2be552923
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Jul 10 17:19:53 2020 +0000
reflog: cleanse messages in the refs.c layer
Regarding reflog messages:
- We expect that a reflog message consists of a single line. The
file format used by the files backend may add a LF after the
message as a delimiter, and output by commands like "git log -g"
may complete such an incomplete line by adding a LF at the end,
but philosophically, the terminating LF is not a part of the
message.
- We however allow callers of refs API to supply a random sequence
of NUL terminated bytes. We cleanse caller-supplied message by
squashing a run of whitespaces into a SP, and by trimming trailing
whitespace, before storing the message. This is how we tolerate,
instead of erring out, a message with LF in it (be it at the end,
in the middle, or both).
Currently, the cleansing of the reflog message is done by the files
backend, before the log is written out. This is sufficient with the
current code, as that is the only backend that writes reflogs. But
new backends can be added that write reflogs, and we'd want the
resulting log message we would read out of "log -g" the same no
matter what backend is used, and moving the code to do so to the
generic layer is a way to do so.
An added benefit is that the "cleansing" function could be updated
later, independent from individual backends, to e.g. allow
multi-line log messages if we wanted to, and when that happens, it
would help a lot to ensure we covered all bases if the cleansing
function (which would be updated) is called from the generic layer.
Side note: I am not interested in supporting multi-line reflog
messages right at the moment (nobody is asking for it), but I
envision that instead of the "squash a run of whitespaces into a SP
and rtrim" cleansing, we can %urlencode problematic bytes in the
message *AND* append a SP at the end, when a new version of Git that
supports multi-line and/or verbatim reflog messages writes a reflog
record. The reading side can detect the presense of SP at the end
(which should have been rtrimmed out if it were written by existing
versions of Git) as a signal that decoding %urlencode recovers the
original reflog message.
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit de966e39a8ba585e6cb0483c49e562c2f6eb3f77
Author: Han-Wen Nienhuys <hanwen@google.com>
Date: Fri Jul 10 17:19:52 2020 +0000
bisect: treat BISECT_HEAD as a pseudo ref
Both the git-bisect.sh as bisect--helper inspected the file system
directly.
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit ce57d85645540fe59e8ec84929288361f1affae7
Author: Han-Wen Nienhuys <hanwen@google.com>
Date: Fri Jul 10 17:19:51 2020 +0000
t3432: use git-reflog to inspect the reflog for HEAD
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 6e2ef8eb06456e288a0a3cc451134479173cebc5
Author: Christian Couder <christian.couder@gmail.com>
Date: Fri Jul 10 18:47:38 2020 +0200
t6300: test refs pointing to tree and blob
Adding tests for refs pointing to tree and blob shows that
we care about testing both positive ("see, my shiny new toy
does work") and negative ("and it won't do nonsensical
things when given an input it is not designed to work with")
cases.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 9fcc9caf368aa1fb9ecc68c64b8918d82a637cdb
Author: Christian Couder <christian.couder@gmail.com>
Date: Fri Jul 10 18:47:37 2020 +0200
Documentation: clarify %(contents:XXXX) doc
Let's avoid a big dense paragraph by using an unordered
list for the %(contents:XXXX) format specifiers.
While at it let's also make the following improvements:
- Let's not describe %(contents) using "complete message"
as it's not clear what an incomplete message is.
- Let's improve how the "subject" and "body" are
described.
- Let's state that "signature" is only available for
tag objects.
Suggested-by: Jeff King <peff@peff.net>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit f4eec0ba842a599649bb9a2abf06bf227c087d65
Author: Jeff King <peff@peff.net>
Date: Thu Jul 9 16:39:09 2020 -0400
t5539: make timestamp requirements more explicit
The test for "no shallow lines after receiving ACK ready" is very
sensitive to the timestamps of the commits we create. It's looking for
the fetch negotiation to send a "ready", which in turn depends on the
order in which we traverse commits during the negotiation.
It works reliably now because the base commit "7" is created without
test_commit, and thus gets a commit time matching the current system
clock. Whereas the new commits created in this test do use test_commit,
and get the usual test_tick time from 2005. So the fetch into the
"clone" repository results in a commit graph like this (I omitted some
of the "unrelated" commits for clarity; they're all just a sequence of
test_ticks):
$ git log --graph --format='%ct %s %d'
* 1112912953 new (origin/master, origin/HEAD)
* 1594322236 7 (grafted, master)
* 1112912893 unrelated15 (origin/unrelated15, unrelated15)
[...]
* 1112912053 unrelated1 (origin/unrelated1, unrelated1)
* 1112911993 new-too (HEAD -> newnew, tag: new-too)
The important things to see are:
- "7" is way in the future compared to the other commits
- "new-too" in the fetching repo is older than "new" (and its
"unrelated" ancestors) in the shallow repo
If we change our "setup shallow clone" step to use test_tick, too (and
get rid of the dependency on the system clock), then the test will fail.
The resulting graph looks like this:
$ git log --graph --format='%ct %s %d'
* 1112913373 new (origin/master, origin/HEAD)
* 1112912353 7 (grafted, master)
* 1112913313 unrelated15 (origin/unrelated15, unrelated15)
[...]
* 1112912473 unrelated1 (origin/unrelated1, unrelated1)
* 1112912413 new-too (HEAD -> newnew, tag: new-too)
Our "new-too" is still older than "new" and "unrelated", but now "7" is
older than all of them (because it advanced test_tick, which the other
tests built on top of). In the original, we advertised "7" as the first
"have" before anything else, but now "new-too" is more recent. You'd see
the same thing in the unlikely event that the system clock was set
before our test_tick default in 2005.
Let's make the timing requirements more explicit. The important thing is
that the client advertise all of its shared commits first, before
presenting its unique "new-too" commit. We can do that and get rid of
the system clock dependency at the same time by creating all of the
shared commits around time X (using test_tick), and then creating
"new-too" with some time long before X. The resulting graph looks like
this:
$ git log --graph --format='%ct %s %d'
* 1500001380 new (origin/master, origin/HEAD)
* 1500000420 7 (grafted, master)
* 1500001320 unrelated15 (origin/unrelated15, unrelated15)
[...]
* 1500000480 unrelated1 (origin/unrelated1, unrelated1)
* 1400000060 new-too (HEAD -> newnew, tag: new-too)
That also lets us get rid of the hacky test_tick added by f0e802ca20
(t5539: update a flaky test, 2014-07-14). That was clearly dancing
around the same problem, but only addressed the relationship between
commits created in the two subshells (which did use test_tick, but
overlapped because increments of test_tick in subshells are lost). Now
that we're using consistent and well-placed times for both lines of
history, we don't have to care about a one-tick difference between the
two sides.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit fccf41e35aed528b7257a4e966437ccd92672bb1
Author: Jeff King <peff@peff.net>
Date: Thu Jul 9 16:35:50 2020 -0400
t9700: loosen ident timezone regex
A few of the perl tests in t9700 ask for the author and committer ident,
and then make sure we get something sensible. For the timestamp portion,
we just match [0-9]+, because the actual value will depend on when the
test is run. However, we do require that the timezone be "+0000". This
works reliably because we set $TZ in test-lib.sh. But in preparation for
changing the default timezone, let's be a bit more flexible. We don't
actually care about the exact value here, just that we were able to get
a sensible output from the perl module's access methods.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit dfaa209a79a831e8ff4f6b8e14a8b0c35b4f6b6e
Author: Ben Wijen <ben@wijen.net>
Date: Fri Jul 10 10:47:32 2020 +0200
git clone: don't clone into non-empty directory
When using git clone with --separate-git-dir realgitdir and
realgitdir already exists, it's content is destroyed.
So, make sure we don't clone into an existing non-empty directory.
When d45420c1 (clone: do not clean up directories we didn't create,
2018-01-02) tightened the clean-up procedure after a failed cloning
into an empty directory, it assumed that the existing directory
given is an empty one so it is OK to keep that directory, while
running the clean-up procedure that is designed to remove everything
in it (since there won't be any, anyway). Check and make sure that
the $GIT_DIR is empty even cloning into an existing repository.
Signed-off-by: Ben Wijen <ben@wijen.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit fe90db89885fd4f0d2a8f378efb82365c291b8ae
Author: Josh Steadmon <steadmon@google.com>
Date: Fri Jul 10 11:38:43 2020 -0700
debian: new "next" snapshot
Signed-off-by: Josh Steadmon <steadmon@google.com>
Change-Id: I1e74374d720fc35ebae95bd8ac878ceb37e6bfbb
commit bde434bcfd29be6d3d3cf94cbf0b49d339a97436
Merge: 42162fce2d f9edc3c819
Author: Josh Steadmon <steadmon@google.com>
Date: Fri Jul 10 11:36:49 2020 -0700
Merge branch 'next' into debian-experimental
Signed-off-by: Josh Steadmon <steadmon@google.com>
Change-Id: If949ecdbe4ebdf0c808c03bfb77ea90d054611d4
commit f9edc3c819edc268d3a429d06d1efb8fa957866b
Merge: 3a9f916ca4 bd42bbe1a4
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jul 9 14:04:49 2020 -0700
Sync with 2.28-rc0
* master:
Git 2.28-rc0
commit 3a9f916ca40b2ea68ad4b4503190234b639740ae
Merge: fa0dce39d2 150cd3b61d
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jul 9 13:11:45 2020 -0700
Merge branch 'sg/commit-graph-progress-fix' into next
The code to produce progress output from "git commit-graph --write"
had a few breakages, which have been fixed.
* sg/commit-graph-progress-fix:
commit-graph: fix "Writing out commit graph" progress counter
commit-graph: fix progress of reachable commits
commit fa0dce39d242d7515eeedd7b7b758f5679d74b05
Merge: 6bf0e26bee 35e6e212fd
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jul 9 13:11:45 2020 -0700
Merge branch 'mt/entry-fstat-fallback-fix' into next
"git checkout" failed to catch an error from fstat() after updating
a path in the working tree.
* mt/entry-fstat-fallback-fix:
entry: check for fstat() errors after checkout
commit 6bf0e26bee5f9744a4cada71e74aaca67089970e
Merge: 15c9d77eb9 81de0c01cf
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jul 9 13:11:42 2020 -0700
Merge branch 'ma/rebase-doc-typofix' into next
Typofix.
* ma/rebase-doc-typofix:
git-rebase.txt: fix description list separator
commit bea866587c7639fac4146cadfdee30fcc9815c36
Author: Philippe Blain <levraiphilippeblain@gmail.com>
Date: Thu Jul 9 02:16:48 2020 +0000
git-log.txt: include rev-list-description.txt
The `git log` synopsis mentions `<revision range>`, and the description
of this option links to gitrevisions(7), but a nice explanation of
how a revision range can be constructed from individual commits,
optionnally prefixed with `^`, also exists in `rev-list-description.txt`.
Include this description in the man page for `git log`.
Add Asciidoc 'ifdef's to `rev-list-description.txt` so that either `git
rev-list` or `git log` appears in the respective man pages.
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 6be6b171a7dc4d901f21b0f24d63147c32ecc008
Author: Philippe Blain <levraiphilippeblain@gmail.com>
Date: Thu Jul 9 02:16:47 2020 +0000
git-rev-list.txt: move description to separate file
A following commit will reuse the description of the `git rev-list`
command in the `git log` manpage.
Move this description to a separate file.
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 6001a1d5e3732cb63438ce2c7852773d3c0eab9a
Author: Philippe Blain <levraiphilippeblain@gmail.com>
Date: Thu Jul 9 02:16:46 2020 +0000
git-rev-list.txt: tweak wording in set operations
Tweak a sentence to make it a little more readable.
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 8560723266f2cb49faf42710c7c380af8d7c0ffd
Author: Philippe Blain <levraiphilippeblain@gmail.com>
Date: Thu Jul 9 02:16:45 2020 +0000
git-rev-list.txt: fix Asciidoc syntax
Using '{caret}' inside double quotes and immediately following with a
single quoted word does not create the desired output: '<commit1>'
appears verbatim instead of being emphasized.
Use a litteral caret ('^') instead.
Also, remove the leading tabs in shell examples to bring them more in
line with the rest of the documentation.
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit f5d9e91ea0b31fa008e807ff14ac7fa1ad413bd8
Author: Philippe Blain <levraiphilippeblain@gmail.com>
Date: Thu Jul 9 02:16:44 2020 +0000
revisions.txt: describe 'rev1 rev2 ...' meaning for ranges
The "Specifying ranges" section does not mention explicitly that
several commits can be specified to form a range.
Add a mention to that effect.
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit f8f28ed9a0229ce19aed3ca516d8ec9a5e66d0c3
Author: Philippe Blain <levraiphilippeblain@gmail.com>
Date: Thu Jul 9 02:16:43 2020 +0000
git-log.txt: add links to 'rev-list' and 'diff' docs
Add links to the documentation for `git rev-list` and `git diff`
instead of simply mentioning them, to make it easier for readers to reach
these documentation pages. Let's link to `git diff` as this is the
porcelain command, and the rest of the family (`diff-index`, `diff-tree` and
`diff-files`) are mentioned in the "Raw output format" section of the
`git diff` documentation.
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit f421e029aef755c6db4f8662e2b6f01c95700959
Author: Jeff King <peff@peff.net>
Date: Tue Jul 7 17:41:51 2020 -0400
t6000: use test_tick consistently
The first two commits created in t6000 are done without test_tick,
meaning they use the current system clock. After that, we create one
with test_tick, which means it uses a deterministic time in the past.
The result of the "symleft flag bit is propagated down from tag" test
relies on the output order of commits from git-log, which in turn
depends on these timestamps. So this test is technically dependent on
the system clock time, though in practice it would only matter if your
system clock was set before test_tick's default time (which is in 2005).
However, let's use test_tick consistently for those early commits (and
update the expected output to match). This makes the test deterministic,
which is in turn easier to reason about and debug.
Note that there's also a fourth commit here, and it does not use
test_tick. It does have a deterministic timestamp because of the prior
use of test_tick in the script, but it will always be the same time as
the third commit. Let's use test_tick here, too, for consistency. The
matching timestamps between the third and fourth commit are not an
important part of the test.
We could also use test_commit in all of these cases, as it runs
test_tick under the hood. But it would be awkward to do so, as these
tests diverge from the usual test_commit patterns (e.g., by creating
multiple files in a single commit).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 6a67c759489e1025665adf78326e9e0d0981bab5
Author: Denton Liu <liu.denton@gmail.com>
Date: Tue Jul 7 02:04:38 2020 -0400
test-lib-functions: restrict test_must_fail usage
In previous commits, we removed the usage of test_must_fail() for most
commands except for a set of pre-approved commands. Since that's done,
only allow test_must_fail() to run those pre-approved commands.
Obviously, we should allow `git`.
We allow `__git*` as some completion functions return an error code that
comes from a git invocation. It's good to avoid using test_must_fail
unnecessarily but it wouldn't hurt to err on the side of caution when
we're potentially wrapping a git command (like in these cases).
We also allow `test-tool` and `test-svn-fe` because these are helper
commands that are written by us and we want to catch their failure.
Finally, we allow `test_terminal` because `test_terminal` just wraps
around git commands. Also, we cannot rewrite
`test_must_fail test_terminal` as `test_terminal test_must_fail` because
test_must_fail() is a shell function and as a result, it cannot be
invoked from the test-terminal Perl script.
We opted to explicitly list the above tools instead of using a catch-all
such as `test[-_]*` because we want to be as restrictive as possible so
that in the future, someone would not accidentally introduce an
unrelated usage of test_must_fail() on an "unapproved" command.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 41feac6f74719922bcc0bd44683518a6d6a8a943
Author: Denton Liu <liu.denton@gmail.com>
Date: Tue Jul 7 18:08:07 2020 -0400
t9400: don't use test_must_fail with cvs
We are using `test_must_fail cvs` to test that the cvs command fails as
expected. However, test_must_fail() is used to ensure that commands fail
in an expected way, not due to something like a segv. Since we are not
in the business of verifying the sanity of the external world, replace
`test_must_fail cvs` with `! cvs` and assume that the cvs command does
not die unexpectedly.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 6e7b0ea864c61288bd5276f3e3cd9250e7a3802d
Author: Denton Liu <liu.denton@gmail.com>
Date: Tue Jul 7 02:04:37 2020 -0400
t9834: remove use of `test_might_fail p4`
The test_must_fail() family of functions (including test_might_fail())
should only be used on git commands. Replace test_might_fail() with
a compound command wrapping the old p4 invocation that always returns 0.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit c96050ff3442067e5848501f25f44a51606f0634
Author: Denton Liu <liu.denton@gmail.com>
Date: Tue Jul 7 02:04:36 2020 -0400
t7107: don't use test_must_fail()
We had a `test_must_fail verify_expect`. However, the git command in
verify_expect() was not expected to fail; the test_cmp() was the failing
command. Be more precise about testing failure by accepting an optional
first argument of '!' which causes the result of the file comparison to
be negated.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 6861ac806b98076121ea69ed41476b14818f07d6
Author: Denton Liu <liu.denton@gmail.com>
Date: Tue Jul 7 02:04:35 2020 -0400
t5324: reorder `run_with_limited_open_files test_might_fail`
In the future, we plan on only allowing `test_might_fail` to work on a
restricted subset of commands, including `git`. Reorder the commands so
that `run_with_limited_open_files` comes before `test_might_fail`. This
way, `test_might_fail` operates on a git command.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 4d9e7c153df9b411d782759bbc8def1c8458f4a6
Author: Denton Liu <liu.denton@gmail.com>
Date: Tue Jul 7 02:04:34 2020 -0400
t3701: stop using `env` in force_color()
In a future patch, we plan on making the test_must_fail()-family of
functions accept only git commands. Even though force_color() wraps an
invocation of `env git`, test_must_fail() will not be able to figure
this out since it will assume that force_color() is just some random
function which is disallowed.
Instead of using `env` in force_color() (which does not support shell
functions), export the environment variables in a subshell. Write the
invocation as `force_color test_must_fail git ...` since shell functions
are now supported.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 15c9d77eb9734cb3f9d6942a7bd70e0526f2ce7a
Merge: de8bde9182 7fbfe07ab4
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jul 6 22:14:22 2020 -0700
Merge branch 'sg/commit-graph-cleanups' into next
The code to produce progress output from "git commit-graph --write"
had a few breakages, which have been fixed.
commit de8bde91823c7f5f0a59620e0c7a2fa1b34184be
Merge: 633bcd552f c0d73a59c9
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jul 9 12:32:14 2020 -0700
Merge branch 'ta/wait-on-aliased-commands-upon-signal' into next
When an aliased command, whose output is piped to a pager by git,
gets killed by a signal, the pager got into a funny state, which
has been corrected (again).
* ta/wait-on-aliased-commands-upon-signal:
Wait for child on signal death for aliases to externals
Wait for child on signal death for aliases to builtins
commit 633bcd552f7fe6a9f95621e1a7f372f654c0a146
Merge: fc1ab4a479 f421e029ae
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jul 9 12:32:13 2020 -0700
Merge branch 'jk/t6000-timestamp-fix' into next
Test update.
* jk/t6000-timestamp-fix:
t6000: use test_tick consistently
commit fc1ab4a479879080e109df04d73774c3e65c2e0e
Merge: 1f7cf947f8 5f46e610cb
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jul 8 18:04:50 2020 -0700
Merge branch 'ct/diff-with-merge-base-clarification' into next
Recent update to "git diff" meant as a code clean-up introduced a
bug in its error handling code, which has been corrected.
* ct/diff-with-merge-base-clarification:
diff: check for merge bases before assigning sym->base
commit 1f7cf947f884096deafc5ac95f98ef43116f733a
Merge: ef1709f4bb b5651a2092
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jul 8 16:56:26 2020 -0700
Merge branch 'jn/eject-fetch-write-commit-graph-out-of-experimental' into next
* jn/eject-fetch-write-commit-graph-out-of-experimental:
experimental: default to fetch.writeCommitGraph=false
commit ef1709f4bb2b2e102951a1ad5dd76d8cd455eeb5
Merge: b3809f4674 ce16364e89
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jul 8 16:56:26 2020 -0700
Merge branch 'tb/fix-persistent-shallow' into next
* tb/fix-persistent-shallow:
commit.c: don't persist substituted parents when unshallowing
commit b3809f4674cea6e2f5db8a478a39b85851690c7d
Merge: 84d6bc67fa 4a0fcf9f76
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jul 6 22:14:51 2020 -0700
Sync with master
commit 84d6bc67fa63f0e9df7362bdb26f8909451d7b72
Merge: 72b1eca511 01faa91cb7
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jul 6 22:14:23 2020 -0700
Merge branch 'rs/line-log-until' into next
"git log -Lx,y:path --before=date" lost track of where the range
should be because it didn't take the changes made by the youngest
commits that are omitted from the output into account.
* rs/line-log-until:
revision: disable min_age optimization with line-log
commit 72b1eca511334cde4f7e9b82b9349c768cd3f0a8
Merge: 270769a009 c2dbcd206d
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jul 6 22:14:23 2020 -0700
Merge branch 'vs/completion-with-set-u' into next
The command line completion support (in contrib/) used to be
prepared to work with "set -u" but recent changes got a bit more
sloppy. This has been corrected.
* vs/completion-with-set-u:
completion: nounset mode fixes
commit 270769a00906a13b24deccc2a33c09a9b4df5f74
Merge: 177e6b362e 0172f7834a
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jul 6 22:14:23 2020 -0700
Merge branch 'cc/cat-file-usage-update' into next
Doc/usage update.
* cc/cat-file-usage-update:
cat-file: add missing [=<format>] to usage/synopsis
commit 177e6b362eac7f94551bec6433f74b8a42105392
Merge: 3892a1ab88 c525ce95b4
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jul 6 22:14:22 2020 -0700
Merge branch 'ds/commit-graph-bloom-updates' into next
Updates to the changed-paths bloom filter.
* ds/commit-graph-bloom-updates:
commit-graph: check all leading directories in changed path Bloom filters
revision: empty pathspecs should not use Bloom filters
revision.c: fix whitespace
commit-graph: check chunk sizes after writing
commit-graph: simplify chunk writes into loop
commit-graph: unify the signatures of all write_graph_chunk_*() functions
commit-graph: persist existence of changed-paths
bloom: fix logic in get_bloom_filter()
commit-graph: change test to die on parse, not load
commit-graph: place bloom_settings in context
commit-graph: simplify write_commit_graph_file() #2
commit-graph: simplify write_commit_graph_file() #1
commit-graph: simplify parse_commit_graph() #2
commit-graph: simplify parse_commit_graph() #1
commit-graph: clean up #includes
diff.h: drop diff_tree_oid() & friends' return value
commit-slab: add a function to deep free entries on the slab
commit-graph-format.txt: all multi-byte numbers are in network byte order
commit-graph: fix parsing the Chunk Lookup table
tree-walk.c: don't match submodule entries for 'submod/anything'
commit 3892a1ab8811060b84c0e085644d20109c1c0833
Merge: c38d766581 f9f60d7066
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Jul 6 22:14:22 2020 -0700
Merge branch 'ra/send-email-in-reply-to-from-command-line-wins' into next
"git send-email --in-reply-to=<msg>" did not use the In-Reply-To:
header with the value given from the command line, and let it be
overridden by the value on In-Reply-To: header in the messages
being sent out (if exists).
* ra/send-email-in-reply-to-from-command-line-wins:
send-email: restore --in-reply-to superseding behavior
![[bug history graph]](https://qa.debian.org/data/bts/graphs/g/git.png){kind=link}