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 776c79911dee44a76352464537b2bf90ea7fa79f
Merge: d398efa59 d79204c8f
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Feb 18 17:34:18 2020 -0800
Merge branch 'debian-sid' into debian-experimental
* debian-sid:
debian: prepare for upload
debian/rules: use dpkg-architecture, not uname, to get arch
debian/control: Maintainer: Jonathan Nieder
debian: new upstream point release
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: Ibef2549ecbbffce30d402ada81689f43b07a0f4f
commit d398efa5916d72128367074a8579a3b661d97158
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Feb 18 17:33:01 2020 -0800
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: I3efe98309aad433c31b894ba679bc5d244aa116c
commit ddc1a72bd929ae5c13e8d6230b92466111528a9e
Merge: d6037d1c9 fbce0eb80
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Feb 18 17:30:39 2020 -0800
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: I30bdd1e9e7d2437d8d0c56587184d013fc9d50ab
commit d79204c8fc7c2981a756a05efaf13cc2e5901dd7
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Feb 18 17:26:39 2020 -0800
debian: prepare for upload
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 80f9a31d5bc9ea0453701b7bf06c3f0deecbbc3f
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Feb 18 17:22:14 2020 -0800
debian/rules: use dpkg-architecture, not uname, to get arch
The "git version --build-options" command prints what arch Git was
built for. Unfortunately, the upstream code to do this gets the arch
using the "uname -m" command instead of "cc -dumpmachine".
Fortunately, in the Debian environment we can get a nice host CPU
string using the "dpkg-architecture" command.
Noticed by the reproducible-builds continuous builder[1]. Thanks to
Ceridwen for adding this variation to reprotest in 0.1~15 ("Add
variations, notes theron, and tests", 2016-06-07).
[1] https://tests.reproducible-builds.org/debian/rb-pkg/unstable/i386/diffoscope-results/git.html
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 4367cb7e6662511e2b34cd3eaaaf5814df2752f3
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Feb 18 16:09:38 2020 -0800
debian/control: Maintainer: Jonathan Nieder
Gerrit writes:
| I'm not about to resume activity on git package maintenance for Debian.
| Thanks for taking that great care over all that time. Please remove me
| from the Maintainer field on the next upload of the git packages.
|
| Thanks and all best
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 089a7f322fcc083dfa1fd47179e67b7397836841
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Feb 18 15:42:33 2020 -0800
debian: new upstream point release
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit edda161f43b63e941da3d21f1aa79ff23ee84271
Merge: 70030c2f8 c522f061d
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Tue Feb 18 15:40:52 2020 -0800
Merge tag 'v2.25.1' into debian-sid
Git 2.25.1
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit fbce0eb801e159d00814c49c7926197b0a3b2bc5
Merge: ed78b064b e68e29171
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Feb 16 20:44:55 2020 -0800
Sync with master
* master:
Git 2.25.1
commit ed78b064b4bb2468187ec351128013d3d6281d6b
Merge: 0909d3f98 e0020b2f8
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Feb 16 20:44:47 2020 -0800
Merge branch 'es/outside-repo-errmsg-hints' into next
Error message clarification.
* es/outside-repo-errmsg-hints:
prefix_path: show gitdir when arg is outside repo
commit 0909d3f9816f8a85610cb25caefac2a7a03b282f
Merge: 6670f36d7 cc4f2eb82
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Feb 16 20:44:47 2020 -0800
Merge branch 'jk/doc-credential-helper' into next
Docfix.
* jk/doc-credential-helper:
doc: move credential helper info into gitcredentials(7)
commit 6670f36d73ad55b899c7cecf549c9113da56db13
Merge: a4ca01efe 08809c09a
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Feb 16 20:44:47 2020 -0800
Merge branch 'js/mingw-open-in-gdb' into next
Dev support.
* js/mingw-open-in-gdb:
mingw: add a helper function to attach GDB to the current process
commit a4ca01efef6a78fcb24fe2b47eaaa0ec989531c2
Merge: 090cac9c2 bfe2bbb47
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Feb 16 20:44:47 2020 -0800
Merge branch 'js/test-unc-fetch' into next
Test updates.
* js/test-unc-fetch:
t5580: test cloning without file://, test fetching via UNC paths
commit 090cac9c23e95f16c3cfeef0ea9d28423d128b05
Merge: 42425c365 de26f02db
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Feb 16 20:44:46 2020 -0800
Merge branch 'js/test-avoid-pipe' into next
Test clean-up.
* js/test-avoid-pipe:
t9001, t9116: avoid pipes
commit 42425c3658f42105a24f211329120a339be5c585
Merge: 2deb24755 3ab3185f9
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Feb 16 20:44:46 2020 -0800
Merge branch 'jk/object-filter-with-bitmap' into next
The object reachability bitmap machinery and the partial cloning
machinery were not prepared to work well together, because some
object-filtering criteria partial clones use inherently rely on
object traversal, but the bitmap machinery is an optimization to
bypass that object traversal. There however are some cases that
they can work together, and they were taught about this case.
* jk/object-filter-with-bitmap:
pack-objects: support filters with bitmaps
pack-bitmap: implement BLOB_LIMIT filtering
pack-bitmap: implement BLOB_NONE filtering
bitmap: add bitmap_unset() function
rev-list: use bitmap filters for traversal
pack-bitmap: basic noop bitmap filter infrastructure
rev-list: allow commit-only bitmap traversals
t5310: factor out bitmap traversal comparison
rev-list: allow bitmaps when counting objects
rev-list: make --count work with --objects
rev-list: factor out bitmap-optimized routines
pack-bitmap: refuse to do a bitmap traversal with pathspecs
rev-list: fallback to non-bitmap traversal when filtering
pack-bitmap: fix leak of haves/wants object lists
pack-bitmap: factor out type iterator initialization
commit 2deb2475500e64affb7e3a2844c60900237634e4
Merge: e864e26f4 076ee3e8a
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Feb 16 20:44:46 2020 -0800
Merge branch 'js/test-write-junit-xml-fix' into next
Testfix.
* js/test-write-junit-xml-fix:
tests: fix --write-junit-xml with subshells
commit e68e29171cc2d6968902e0654b5687fbe1ccb903
Merge: bfdd66e72 c522f061d
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Feb 16 20:41:40 2020 -0800
Sync with 2.25.1
commit e0020b2f82910f50bc697d86aff70c3796fbdc41
Author: Emily Shaffer <emilyshaffer@google.com>
Date: Fri Feb 14 17:00:13 2020 -0800
prefix_path: show gitdir when arg is outside repo
When developing a script, it can be painful to understand why Git thinks
something is outside the current repo, if the current repo isn't what
the user thinks it is. Since this can be tricky to diagnose, especially
in cases like submodules or nested worktrees, let's give the user a hint
about which repository is offended about that path.
Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
Acked-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit cc4f2eb8281ab9f6f71694834ea01c93572d224a
Author: Jeff King <peff@peff.net>
Date: Fri Feb 14 13:54:59 2020 -0500
doc: move credential helper info into gitcredentials(7)
The details of how credential helpers can be called or implemented were
originally covered in Documentation/technical/. Those are topics that
end users might care about (and we even referenced them in the
credentials manpage), but those docs typically don't ship as part of the
end user documentation, making them less useful.
This situation got slightly worse recently in f3b9055624 (credential:
move doc to credential.h, 2019-11-17), where we moved them into the C
header file, making them even harder to find.
So let's move put this information into the gitcredentials(7)
documentation, which is meant to describe the overall concepts of our
credential handling. This was already pointing to the API docs for these
concepts, so we can just include it inline instead.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit e864e26f49b84990261b43663b1b4f9b29cd8a31
Merge: 3799757bb bfdd66e72
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 13:02:41 2020 -0800
Sync with master
commit 3799757bbe66b8ceb8677e31ec0d68ff3fe0525b
Merge: cc17dbc7e ef0765992
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 13:02:22 2020 -0800
Merge branch 'ds/sparse-add' into next
"git sparse-checkout" learned a new "add" subcommand.
* ds/sparse-add:
sparse-checkout: work with Windows paths
sparse-checkout: create 'add' subcommand
sparse-checkout: extract pattern update from 'set' subcommand
sparse-checkout: extract add_patterns_from_input()
commit cc17dbc7e89010e89e7f0fe1525fb7b1cc8ca1b9
Merge: 30b1a477d c444f032e
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 13:02:22 2020 -0800
Merge branch 'es/bright-colors' into next
The basic 7 colors learned the brighter counterparts
(e.g. "brightred").
* es/bright-colors:
color.c: alias RGB colors 8-15 to aixterm colors
color.c: support bright aixterm colors
color.c: refactor color_output arguments
commit 30b1a477debe30bc67f4022919c163b4713f2844
Merge: cffb4d697 b3fd6cbf2
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 13:02:21 2020 -0800
Merge branch 'bw/remote-rename-update-config' into next
"git remote rename X Y" needs to adjust configuration variables
(e.g. branch.<name>.remote) whose value used to be X to Y.
branch.<name>.pushRemote is now also updated.
* bw/remote-rename-update-config:
remote rename/remove: gently handle remote.pushDefault config
config: provide access to the current line number
remote rename/remove: handle branch.<name>.pushRemote config values
remote: clean-up config callback
remote: clean-up by returning early to avoid one indentation
pull --rebase/remote rename: document and honor single-letter abbreviations rebase types
commit bfdd66e72fffd18235757bedbf355fd4176d6019
Merge: 7ae7e234c 6141e0cc0
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:31 2020 -0800
Sync with maint
commit 7ae7e234c7e75dace3ba8aa8d87166ac7d75d7dd
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:07 2020 -0800
The fifth batch for 2.26
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 53c3be2c29b97a68145d42b413df2f8c070a2084
Merge: 7b029ebae a7df60cac
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:24 2020 -0800
Merge branch 'tb/commit-graph-object-dir'
The code to compute the commit-graph has been taught to use a more
robust way to tell if two object directories refer to the same
thing.
* tb/commit-graph-object-dir:
commit-graph.h: use odb in 'load_commit_graph_one_fd_st'
commit-graph.c: remove path normalization, comparison
commit-graph.h: store object directory in 'struct commit_graph'
commit-graph.h: store an odb in 'struct write_commit_graph_context'
t5318: don't pass non-object directory to '--object-dir'
commit 7b029ebaefd945b2315281fcdf9c35843641623b
Merge: aa21cc97b a21781011
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:24 2020 -0800
Merge branch 'jk/index-pack-dupfix'
The index-pack code now diagnoses a bad input packstream that
records the same object twice when it is used as delta base; the
code used to declare a software bug when encountering such an
input, but it is an input error.
* jk/index-pack-dupfix:
index-pack: downgrade twice-resolved REF_DELTA to die()
commit aa21cc97bd10ab0b62f6d951ff2ff725261e326e
Merge: 883326077 5290d4513
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:23 2020 -0800
Merge branch 'jk/alloc-cleanups'
Misc code clean-ups.
* jk/alloc-cleanups:
tree-walk.c: break circular dependency with unpack-trees
traverse_trees(): use stack array for name entries
walker_fetch(): avoid raw array length computation
normalize_path_copy(): document "dst" size expectations
commit 883326077a1995a5ea122c298ff47fcd85782c49
Merge: f2dcfcc21 dbc27477f
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:23 2020 -0800
Merge branch 'jh/notes-fanout-fix'
The code to automatically shrink the fan-out in the notes tree had
an off-by-one bug, which has been killed.
* jh/notes-fanout-fix:
notes.c: fix off-by-one error when decreasing notes fanout
t3305: check notes fanout more carefully and robustly
commit f2dcfcc21d233c71e47e2ddae799968a18775a1d
Merge: 78e67cda4 f38c92452
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:23 2020 -0800
Merge branch 'pk/status-of-uncloned-submodule'
The way "git submodule status" reports an initialized but not yet
populated submodule has not been reimplemented correctly when a
part of the "git submodule" command was rewritten in C, which has
been corrected.
* pk/status-of-uncloned-submodule:
t7400: testcase for submodule status on unregistered inner git repos
submodule: fix status of initialized but not cloned submodules
t7400: add a testcase for submodule status on empty dirs
commit 78e67cda42a440f216fc4cbfd8a9e190c5eece5a
Merge: df04a3161 b98d18858
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:22 2020 -0800
Merge branch 'mt/use-passed-repo-more-in-funcs'
Some codepaths were given a repository instance as a parameter to
work in the repository, but passed the_repository instance to its
callees, which has been cleaned up (somewhat).
* mt/use-passed-repo-more-in-funcs:
sha1-file: allow check_object_signature() to handle any repo
sha1-file: pass git_hash_algo to hash_object_file()
sha1-file: pass git_hash_algo to write_object_file_prepare()
streaming: allow open_istream() to handle any repo
pack-check: use given repo's hash_algo at verify_packfile()
cache-tree: use given repo's hash_algo at verify_one()
diff: make diff_populate_filespec() honor its repo argument
commit df04a316176d5ba44422c2c6b0cb1a9fc31901e5
Merge: 433b8aac2 da8063522
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:22 2020 -0800
Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing'
The diff-* plumbing family of subcommands now pay attention to the
diff.wsErrorHighlight configuration, which has been ignored before;
this allows "git add -p" to also show the whitespace problems to
the end user.
* jk/diff-honor-wserrhighlight-in-plumbing:
diff: move diff.wsErrorHighlight to "basic" config
commit 433b8aac2eb7a8bc3e383a072f7df7d15c4aabbb
Merge: 4a77434bc f998a3f1e
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:22 2020 -0800
Merge branch 'ds/sparse-checkout-harden'
Some rough edges in the sparse-checkout feature, especially around
the cone mode, have been cleaned up.
* ds/sparse-checkout-harden:
sparse-checkout: fix cone mode behavior mismatch
sparse-checkout: improve docs around 'set' in cone mode
sparse-checkout: escape all glob characters on write
sparse-checkout: use C-style quotes in 'list' subcommand
sparse-checkout: unquote C-style strings over --stdin
sparse-checkout: write escaped patterns in cone mode
sparse-checkout: properly match escaped characters
sparse-checkout: warn on globs in cone patterns
sparse-checkout: detect short patterns
sparse-checkout: cone mode does not recognize "**"
sparse-checkout: fix documentation typo for core.sparseCheckoutCone
clone: fix --sparse option with URLs
sparse-checkout: create leading directories
t1091: improve here-docs
t1091: use check_files to reduce boilerplate
commit 4a77434bc83c07c17ddc321b3892337b5533eda1
Merge: 8fb394503 43f33e492
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:22 2020 -0800
Merge branch 'ld/p4-cleanup-processes'
p4 updates.
* ld/p4-cleanup-processes:
git-p4: avoid leak of file handle when cloning
git-p4: check for access to remote host earlier
git-p4: cleanup better on error exit
git-p4: create helper function importRevisions()
git-p4: disable some pylint warnings, to get pylint output to something manageable
git-p4: add P4CommandException to report errors talking to Perforce
git-p4: make closeStreams() idempotent
commit 8fb39450371ce9a89e0f551c94f02e73819f8325
Merge: 09e48400a 2df1aa239
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:21 2020 -0800
Merge branch 'jt/connectivity-check-optim-in-partial-clone'
Unneeded connectivity check is now disabled in a partial clone when
fetching into it.
* jt/connectivity-check-optim-in-partial-clone:
fetch: forgo full connectivity check if --filter
connected: verify promisor-ness of partial clone
commit 09e48400a3537db841b94790f070c4b843fc0bd0
Merge: 4dbeecba2 b0418303b
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:21 2020 -0800
Merge branch 'jk/get-oid-error-message-i18n'
A low-level API function get_oid(), that accepts various ways to
name an object, used to issue end-user facing error messages
without l10n, which has been updated to be translatable.
* jk/get-oid-error-message-i18n:
sha1-name: mark get_oid() error messages for translation
t1506: drop space after redirection operator
t1400: avoid "test" string comparisons
commit 4dbeecba27983a86c17383280856bbbe385ceb8d
Merge: f7f43afb1 5a5445d87
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:21 2020 -0800
Merge branch 'ag/edit-todo-drop-check'
Allow the rebase.missingCommitsCheck configuration to kick in when
"rebase --edit-todo" and "rebase --continue" restarts the procedure.
* ag/edit-todo-drop-check:
rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
sequencer: move check_todo_list_from_file() to rebase-interactive.c
commit f7f43afb190131d4502f00cecd2361ebbd654030
Merge: d8b8d5905 37a63faae
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:21 2020 -0800
Merge branch 'dl/test-must-fail-fixes-2'
Test updates.
* dl/test-must-fail-fixes-2:
t4124: only mark git command with test_must_fail
t3507: use test_path_is_missing()
t3507: fix indentation
t3504: do check for conflict marker after failed cherry-pick
t3419: stop losing return code of git command
t3415: increase granularity of test_auto_{fixup,squash}()
t3415: stop losing return codes of git commands
t3310: extract common notes_merge_files_gone()
t3030: use test_path_is_missing()
t2018: replace "sha" with "oid"
t2018: don't lose return code of git commands
t2018: teach do_checkout() to accept `!` arg
t2018: be more discerning when checking for expected exit codes
t2018: improve style of if-statement
t2018: add space between function name and ()
t2018: remove trailing space from test description
commit d8b8d59054ed5ba2f79d3cb2fad0b5f0bfeb3ac1
Merge: 251187084 767a9c417
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:20 2020 -0800
Merge branch 'ag/rebase-avoid-unneeded-checkout'
"git rebase -i" (and friends) used to unnecessarily check out the
tip of the branch to be rebased, which has been corrected.
* ag/rebase-avoid-unneeded-checkout:
rebase -i: stop checking out the tip of the branch to rebase
commit 251187084d5ebdb3ba898ba4a8f9b005b7626655
Merge: c9a33e5e5 26027625d
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:20 2020 -0800
Merge branch 'js/rebase-i-with-colliding-hash'
"git rebase -i" identifies existing commits in its todo file with
their abbreviated object name, which could become ambigous as it
goes to create new commits, and has a mechanism to avoid ambiguity
in the main part of its execution. A few other cases however were
not covered by the protection against ambiguity, which has been
corrected.
* js/rebase-i-with-colliding-hash:
rebase -i: also avoid SHA-1 collisions with missingCommitsCheck
rebase -i: re-fix short SHA-1 collision
parse_insn_line(): improve error message when parsing failed
commit c9a33e5e5d7e124feb86ccff08ea466faff53b26
Merge: 56ceb64eb dfaed0286
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:20 2020 -0800
Merge branch 'kw/fsmonitor-watchman-racefix'
A new version of fsmonitor-watchman hook has been introduced, to
avoid races.
* kw/fsmonitor-watchman-racefix:
fsmonitor: update documentation for hook version and watchman hooks
fsmonitor: add fsmonitor hook scripts for version 2
fsmonitor: handle version 2 of the hooks that will use opaque token
fsmonitor: change last update timestamp on the index_state to opaque token
commit 56ceb64eb0377acb2884226d4fb7d7c3f4032354
Merge: 0da63da79 f1928f04b
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:20 2020 -0800
Merge branch 'mt/threaded-grep-in-object-store'
Traditionally, we avoided threaded grep while searching in objects
(as opposed to files in the working tree) as accesses to the object
layer is not thread-safe. This limitation is getting lifted.
* mt/threaded-grep-in-object-store:
grep: use no. of cores as the default no. of threads
grep: move driver pre-load out of critical section
grep: re-enable threads in non-worktree case
grep: protect packed_git [re-]initialization
grep: allow submodule functions to run in parallel
submodule-config: add skip_if_read option to repo_read_gitmodules()
grep: replace grep_read_mutex by internal obj read lock
object-store: allow threaded access to object reading
replace-object: make replace operations thread-safe
grep: fix racy calls in grep_objects()
grep: fix race conditions at grep_submodule()
grep: fix race conditions on userdiff calls
commit 0da63da7942ce810126cd54d9f72a46f3d616895
Merge: a14aebeac 684ceae32
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:19 2020 -0800
Merge branch 'jn/promote-proto2-to-default'
The transport protocol version 2 becomes the default one.
* jn/promote-proto2-to-default:
fetch: default to protocol version 2
protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION
test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate
config doc: protocol.version is not experimental
fetch test: use more robust test for filtered objects
commit a14aebeac330e6d58f9628a02521ea780daf0a5b
Merge: daef1b300 d2ea03104
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:19 2020 -0800
Merge branch 'jk/packfile-reuse-cleanup'
The way "git pack-objects" reuses objects stored in existing pack
to generate its result has been improved.
* jk/packfile-reuse-cleanup:
pack-bitmap: don't rely on bitmap_git->reuse_objects
pack-objects: add checks for duplicate objects
pack-objects: improve partial packfile reuse
builtin/pack-objects: introduce obj_is_packed()
pack-objects: introduce pack.allowPackReuse
csum-file: introduce hashfile_total()
pack-bitmap: simplify bitmap_has_oid_in_uninteresting()
pack-bitmap: uninteresting oid can be outside bitmapped packfile
pack-bitmap: introduce bitmap_walk_contains()
ewah/bitmap: introduce bitmap_word_alloc()
packfile: expose get_delta_base()
builtin/pack-objects: report reused packfile objects
commit daef1b300b07c3d17d47c3bf01ebde28b62ff3fe
Merge: d8437c57f 887a0fd57
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Feb 14 12:54:19 2020 -0800
Merge branch 'hw/advice-add-nothing'
Two help messages given when "git add" notices the user gave it
nothing to add have been updated to use advise() API.
* hw/advice-add-nothing:
add: change advice config variables used by the add API
add: use advise function to display hints
commit d6037d1c9810cd9465e76405b0371b1aa5400e54
Author: Emily Shaffer <emilyshaffer@google.com>
Date: Fri Feb 14 11:52:21 2020 -0800
debian: new "next" snapshot
Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
Change-Id: I89a3d77d5f079a61866f011b6a9d2d9da8a07d4e
commit d3fbbf0e3c14a85c3ac626e6bafd8dde707c4f78
Merge: 941cdb0ba cffb4d697
Author: Emily Shaffer <emilyshaffer@google.com>
Date: Fri Feb 14 11:51:59 2020 -0800
Merge branch 'next' into debian-experimental
Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
Change-Id: I1fcd88cab6f14edcebf95ba474cd0d1c9abadc55
commit 3ab3185f999f5d0d0079ac8246edb8fca5d9d3fd
Author: Jeff King <peff@peff.net>
Date: Fri Feb 14 13:22:41 2020 -0500
pack-objects: support filters with bitmaps
Just as rev-list recently learned to combine filters and bitmaps, let's
do the same for pack-objects. The infrastructure is all there; we just
need to pass along our filter options, and the pack-bitmap code will
decide to use bitmaps or not.
This unsurprisingly makes things faster for partial clones of large
repositories (here we're cloning linux.git):
Test HEAD^ HEAD
------------------------------------------------------------------------------
5310.11: simulated partial clone 38.94(37.28+5.87) 11.06(11.27+4.07) -71.6%
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 84243da1298890bd7370df66b754c2b252a08346
Author: Jeff King <peff@peff.net>
Date: Fri Feb 14 13:22:39 2020 -0500
pack-bitmap: implement BLOB_LIMIT filtering
Just as the previous commit implemented BLOB_NONE, we can support
BLOB_LIMIT filters by looking at the sizes of any blobs in the result
and unsetting their bits as appropriate. This is slightly more expensive
than BLOB_NONE, but still produces a noticeable speedup (these results
are on git.git):
Test HEAD~2 HEAD
------------------------------------------------------------------------------------
5310.9: rev-list count with blob:none 1.80(1.77+0.02) 0.22(0.20+0.02) -87.8%
5310.10: rev-list count with blob:limit=1k 1.99(1.96+0.03) 0.29(0.25+0.03) -85.4%
The implementation is similar to the BLOB_NONE one, with the exception
that we have to go object-by-object while walking the blob-type bitmap
(since we can't mask out the matches, but must look up the size
individually for each blob). The trick with using ctz64() is taken from
show_objects_for_type(), which likewise needs to find individual bits
(but wants to quickly skip over big chunks without blobs).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 4f3bd5606a02260274555f41fd7d6368f2bea1d8
Author: Jeff King <peff@peff.net>
Date: Fri Feb 14 13:22:36 2020 -0500
pack-bitmap: implement BLOB_NONE filtering
We can easily support BLOB_NONE filters with bitmaps. Since we know the
types of all of the objects, we just need to clear the result bits of
any blobs.
Note two subtleties in the implementation (which I also called out in
comments):
- we have to include any blobs that were specifically asked for (and
not reached through graph traversal) to match the non-bitmap version
- we have to handle in-pack and "ext_index" objects separately.
Arguably prepare_bitmap_walk() could be adding these ext_index
objects to the type bitmaps. But it doesn't for now, so let's match
the rest of the bitmap code here (it probably wouldn't be an
efficiency improvement to do so since the cost of extending those
bitmaps is about the same as our loop here, but it might make the
code a bit simpler).
Here are perf results for the new test on git.git:
Test HEAD^ HEAD
--------------------------------------------------------------------------------
5310.9: rev-list count with blob:none 1.67(1.62+0.05) 0.22(0.21+0.02) -86.8%
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit cc4aa28506e079e0c17cfbe78743530795803ea8
Author: Jeff King <peff@peff.net>
Date: Fri Feb 14 13:22:34 2020 -0500
bitmap: add bitmap_unset() function
We've never needed to unset an individual bit in a bitmap until now.
Typically they start with all bits unset and we bitmap_set() them, or we
are applying another bitmap as a mask. But the easiest way to apply an
object filter to a bitmap result will be to unset the individual bits.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 2aaeb9ac414d75f875efa968480db1ce85dc8dc5
Author: Jeff King <peff@peff.net>
Date: Fri Feb 14 13:22:32 2020 -0500
rev-list: use bitmap filters for traversal
This just passes the filter-options struct to prepare_bitmap_walk().
Since the bitmap code doesn't actually support any filters yet, it will
fallback to the non-bitmap code if any --filter is specified. But this
lets us exercise that rejection code path, as well as getting us ready
to test filters via rev-list when we _do_ support them.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 6663ae0a0818aba5d4de289b1a37e1961ad6c367
Author: Jeff King <peff@peff.net>
Date: Fri Feb 14 13:22:29 2020 -0500
pack-bitmap: basic noop bitmap filter infrastructure
Currently you can't use object filters with bitmaps, but we plan to
support at least some filters with bitmaps. Let's introduce some
infrastructure that will help us do that:
- prepare_bitmap_walk() now accepts a list_objects_filter_options
parameter (which can be NULL for no filtering; all the current
callers pass this)
- we'll bail early if the filter is incompatible with bitmaps (just as
we would if there were no bitmaps at all). Currently all filters are
incompatible.
- we'll filter the resulting bitmap; since there are no supported
filters yet, this is always a noop.
There should be no behavior change yet, but we'll support some actual
filters in a future patch.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 4eb707ebd681eb85306071db33ed70186d1642ac
Author: Jeff King <peff@peff.net>
Date: Fri Feb 14 13:22:27 2020 -0500
rev-list: allow commit-only bitmap traversals
Ever since we added reachability bitmap support, we've been able to use
it with rev-list to get the full list of objects, like:
git rev-list --objects --use-bitmap-index --all
But you can't do so without --objects, since we weren't ready to just
show the commits. However, the internals of the bitmap code are mostly
ready for this: they avoid opening up trees when walking to fill in the
bitmaps. We just need to actually pass in the rev_info to
traverse_bitmap_commit_list() so it knows which types to bother
triggering our callback for.
For completeness, the perf test now covers both the existing --objects
case, as well as the new commits-only behavior (the objects one got way
faster when we introduced bitmaps, but obviously isn't improved now).
Here are numbers for linux.git:
Test HEAD^ HEAD
------------------------------------------------------------------------
5310.7: rev-list (commits) 8.29(8.10+0.19) 1.76(1.72+0.04) -78.8%
5310.8: rev-list (objects) 8.06(7.94+0.12) 8.14(7.94+0.13) +1.0%
That run was cheating a little, as I didn't have any commit-graph in the
repository, and we'd built it by default these days when running git-gc.
Here are numbers with a commit-graph:
Test HEAD^ HEAD
------------------------------------------------------------------------
5310.7: rev-list (commits) 0.70(0.58+0.12) 0.51(0.46+0.04) -27.1%
5310.8: rev-list (objects) 6.20(6.09+0.10) 6.27(6.16+0.11) +1.1%
Still an improvement, but a lot less impressive.
We could have the perf script remove any commit-graph to show the
out-sized effect, but it probably makes sense to leave it in what would
be a more typical setup.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit ea047a8eb4f45c1c4e3c9b1af919bf0361ac1b7c
Author: Jeff King <peff@peff.net>
Date: Fri Feb 14 13:22:25 2020 -0500
t5310: factor out bitmap traversal comparison
We check the results of "rev-list --use-bitmap-index" by comparing it to
the same traversal without the bitmap option. However, this is a little
tricky to do because of some output differences (see the included
comment for details). Let's pull this out into a helper function, since
we'll be adding some similar tests.
While we're at it, let's also try to confirm that the bitmap output did
indeed use bitmaps. Since the code internally falls back to the
non-bitmap path in some cases, the tests are at risk of becoming trivial
noops.
This is a bit fragile, as not all outputs will differ (e.g., looking at
only the commits from a fully-bitmapped pack will end up exactly the
same as the normal traversal order, since it also matches the pack
order). So we'll provide an escape hatch by which tests can disable this
check (which should only be used after manually confirming that bitmaps
kicked in).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 608d9c93658d6ec2d585748ed45218cc1f404640
Author: Jeff King <peff@peff.net>
Date: Fri Feb 14 13:22:22 2020 -0500
rev-list: allow bitmaps when counting objects
The prior commit taught "--count --objects" to work without bitmaps. We
should be able to get the same answer much more quickly with bitmaps.
Note that we punt on the max_count case here. This perhaps _could_ be
made to work if we find all of the boundary commits and treat them as
UNINTERESTING, subtracting them (and their reachable objects) from the
set we return. That implies an actual commit traversal, but we'd still
be faster due to avoiding opening up any trees. Given the complexity and
the fact that anyone is unlikely to want this, it makes sense to just
fall back to the non-bitmap case for now.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 55cb10f9b5cd7216652a5879b792bcd7ac173035
Author: Jeff King <peff@peff.net>
Date: Fri Feb 14 13:22:20 2020 -0500
rev-list: make --count work with --objects
The current behavior from "rev-list --count --objects" is nonsensical:
we enumerate all of the objects except commits, but then give a count of
commits. This wasn't planned, and is just what the code happens to do.
Instead, let's give the answer the user almost certainly wanted: the
full count of objects.
Note that there are more complicated cases around cherry-marking, etc.
We'll punt on those for now, but let the user know that we can't produce
an answer (rather than giving them something useless).
We'll test both the new feature as well as a vanilla --count of commits,
since that surprisingly doesn't seem to be covered in the existing
tests.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 792f8119986bd354eb4ea0858dfd45904120c257
Author: Jeff King <peff@peff.net>
Date: Fri Feb 14 13:22:18 2020 -0500
rev-list: factor out bitmap-optimized routines
There are a few operations in rev-list that are optimized for bitmaps.
Rather than having the code inline in cmd_rev_list(), let's move them
into helpers. This not only makes the flow of the main function simpler,
but it lets us replace the complex "can we do the optimization?"
conditionals with a series of early returns from the functions. That
also makes it easy to add comments explaining those conditions.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit d90fe06ea7dd15bdbd555ad2f4bfdd069032b697
Author: Jeff King <peff@peff.net>
Date: Fri Feb 14 13:22:16 2020 -0500
pack-bitmap: refuse to do a bitmap traversal with pathspecs
rev-list has refused to use bitmaps with pathspec limiting since
c8a70d3509 (rev-list: disable --use-bitmap-index when pruning commits,
2015-07-01). But this is true not just for rev-list, but for anyone who
calls prepare_bitmap_walk(); the code isn't equipped to handle this
case. We never noticed because the only other callers would never pass
a pathspec limiter.
But let's push the check down into prepare_bitmap_walk() anyway. That's
a more logical place for it to live, as callers shouldn't need to know
the details (and must be prepared to fall back to a regular traversal
anyway, since there might not be bitmaps in the repository).
It would also prepare us for a day where this case _is_ handled, but
that's pretty unlikely. E.g., we could use bitmaps to generate the set
of commits, and then diff each commit to see if it matches the pathspec.
That would be slightly faster than a naive traversal that actually walks
the commits. But you'd probably do better still to make use of the newer
commit-graph feature to make walking the commits very cheap.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 08809c09aa1351b603e9c55734105cd2e3c24c41
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu Feb 13 21:49:53 2020 +0000
mingw: add a helper function to attach GDB to the current process
When debugging Git, the criss-cross spawning of processes can make
things quite a bit difficult, especially when a Unix shell script is
thrown in the mix that calls a `git.exe` that then segfaults.
To help debugging such things, we introduce the `open_in_gdb()` function
which can be called at a code location where the segfault happens (or as
close as one can get); This will open a new MinTTY window with a GDB
that already attached to the current process.
Inspired by Derrick Stolee.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit bfe2bbb47f1213e9d4ef6b8d1679b58b37485625
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu Feb 13 21:51:44 2020 +0000
t5580: test cloning without file://, test fetching via UNC paths
On Windows, it is quite common to work with network drives. The format
of the paths to network drives (or "network shares", or UNC paths) is:
\\<server>\<share>\...
We already have a couple regression tests revolving around those types
of paths, but we missed cloning and fetching from UNC paths without
leading `file://` (and with backslashes instead of forward slashes).
This lil' patch closes that gap.
It gets a bit silly to add the commands to the name of the test script,
so let's just rename it while we're testing more UNC stuff.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit de26f02db1b3296fc48e04755301171cf23062a0
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri Feb 14 13:53:21 2020 +0000
t9001, t9116: avoid pipes
When grepping through the output of a command in the test suite, there
is always a chance that something goes wrong, in which case there would
not be anything useful to debug.
Let's redirect the output into a file instead, and grep that file, so
that the log can be inspected easily if the grep fails.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit e03f928e2ab92e47467d48520a73a19582dff286
Author: Jeff King <peff@peff.net>
Date: Wed Feb 12 21:17:30 2020 -0500
rev-list: fallback to non-bitmap traversal when filtering
The "--use-bitmap-index" option is usually aspirational: if we have
bitmaps and the request can be fulfilled more quickly using them we'll
do so, but otherwise fall back to a non-bitmap traversal.
The exception is object filtering, which explicitly dies if the two
options are combined. Let's convert this to the usual fallback behavior.
This is a minor convenience for now (since the caller can easily know
that --filter and --use-bitmap-index don't combine), but will become
much more useful as we start to support _some_ filters with bitmaps, but
not others.
The test infrastructure here is bigger than necessary for checking this
one small feature. But it will serve as the basis for more filtering
bitmap tests in future patches.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit acac50dd8c2c9725841b3e9143d78c6345dc076c
Author: Jeff King <peff@peff.net>
Date: Wed Feb 12 21:16:33 2020 -0500
pack-bitmap: fix leak of haves/wants object lists
When we do a bitmap-aware revision traversal, we create an object_list
for each of the "haves" and "wants" tips. After creating the result
bitmaps these are no longer needed or used, but we never free the list
memory.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 551cf8b655fa73c90dabea633d41b5f10deffaf2
Author: Jeff King <peff@peff.net>
Date: Wed Feb 12 21:16:15 2020 -0500
pack-bitmap: factor out type iterator initialization
When count_object_type() wants to iterate over the bitmap of all objects
of a certain type, we have to pair up OBJ_COMMIT with bitmap->commits,
and so forth. Since we're about to add more code to iterate over these
bitmaps, let's pull the initialization into its own function.
We can also use this to simplify traverse_bitmap_commit_list(). It
accomplishes the same thing by manually passing the object type and the
bitmap to show_objects_for_type(), but using our helper we just need the
object type.
Note there's one small code change here: previously we'd simply return
zero when counting an unknown object type, and now we'll BUG(). This
shouldn't matter in practice, as all of the callers pass in only usual
commit/tree/blob/tag types.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit cffb4d697ea3219afa675b81c08f1fe6006a74d1
Merge: ab9890fbc d8437c57f
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 12 12:57:09 2020 -0800
Sync with master
commit d8437c57fa0752716dde2d3747e7c22bf7ce2e41
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 12 12:12:08 2020 -0800
The fourth batch for 2.26
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit a3dcf84df0557df65d0b90bb732f26e84196566c
Merge: 0de2d1409 2b0f19fa7
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 12 12:41:39 2020 -0800
Merge branch 'js/convert-typofix'
Typofix.
* js/convert-typofix:
convert: fix typo
commit 0de2d1409bb2a8a1cc53a1e44dcaf5de5c4313b4
Merge: 0410c2ba3 30183894e
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 12 12:41:39 2020 -0800
Merge branch 'js/ci-squelch-doc-warning'
Squelch unhelpful warning message during documentation build.
* js/ci-squelch-doc-warning:
ci: ignore rubygems warning in the "Documentation" job
commit 0410c2ba31947772df3bc692cdc31ff0f4470042
Merge: 0d114107f eb31044ff
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 12 12:41:39 2020 -0800
Merge branch 'jb/multi-pack-index-docfix'
Doc fix.
* jb/multi-pack-index-docfix:
pack-format: correct multi-pack-index description
commit 0d114107f58cebdee5e25ea46e161531c24cb5d8
Merge: e99c325bb 9299f8492
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 12 12:41:38 2020 -0800
Merge branch 'ma/diff-doc-clarify-regexp-example'
Doc clarification.
* ma/diff-doc-clarify-regexp-example:
diff-options.txt: avoid "regex" overload in example
commit e99c325bb48cc2e30a763963bff0eb3eceed35ec
Merge: afa34c5cf 7378ec90e
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 12 12:41:38 2020 -0800
Merge branch 'ms/doc-bundle-format'
Technical details of the bundle format has been documented.
* ms/doc-bundle-format:
doc: describe Git bundle format
commit afa34c5cf3ec96b2bc6f2faddf5860fa06cb0f26
Merge: db72f8c94 303b3c1c4
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 12 12:41:38 2020 -0800
Merge branch 'es/submodule-fetch-message-fix'
Error message fix.
* es/submodule-fetch-message-fix:
submodule: add newline on invalid submodule error
commit db72f8c940b3c49286fb88958b3c50fe6f0d6319
Merge: 3d2471ba8 395518cf7
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 12 12:41:37 2020 -0800
Merge branch 'jb/parse-options-message-fix'
Error message fix.
* jb/parse-options-message-fix:
parse-options: lose an unnecessary space in an error message
commit 3d2471ba855e536489710114b609482b9f781a24
Merge: b2099ebb1 e469afe15
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 12 12:41:37 2020 -0800
Merge branch 'ma/filter-branch-doc-caret'
Doc mark-up updates.
* ma/filter-branch-doc-caret:
git-filter-branch.txt: wrap "maths" notation in backticks
commit b2099ebb123af2b299c8125b7a839df44faec68a
Merge: 44cba9c4b 04e5b3f0b
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 12 12:41:37 2020 -0800
Merge branch 'km/submodule-doc-use-sm-path'
Docfix.
* km/submodule-doc-use-sm-path:
submodule foreach: replace $path with $sm_path in example
commit 44cba9c4b37159ef2f09c122c358c74bde466677
Merge: 556ccd4dd 145136a95
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 12 12:41:37 2020 -0800
Merge branch 'jc/skip-prefix'
Code simplification.
* jc/skip-prefix:
C: use skip_prefix() to avoid hardcoded string length
commit 556ccd4dd2943009270b46b9af443a396bff4dfc
Merge: 17e4a1b14 c56c48dd0
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 12 12:41:36 2020 -0800
Merge branch 'pb/do-not-recurse-grep-no-index'
"git grep --no-index" should not get affected by the contents of
the .gitmodules file but when "--recurse-submodules" is given or
the "submodule.recurse" variable is set, it did. Now these
settings are ignored in the "--no-index" mode.
* pb/do-not-recurse-grep-no-index:
grep: ignore --recurse-submodules if --no-index is given
commit 17e4a1b141a4174955dd19131094c3c1cdeb5a8d
Merge: 4cf7f4889 d82ad5494
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 12 12:41:36 2020 -0800
Merge branch 'hw/doc-git-dir'
One effect of specifying where the GIT_DIR is (either with the
environment variable, or with the "git --git-dir=<where> cmd"
option) is to disable the repository discovery. This has been
placed a bit more stress in the documentation, as new users often
get confused.
* hw/doc-git-dir:
git: update documentation for --git-dir
commit 4cf7f48891d36d9ec3783119ddc1177fa9f0581e
Merge: b78339101 8b2a1928f
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 12 12:41:36 2020 -0800
Merge branch 'jk/push-default-doc'
Doc update.
* jk/push-default-doc:
doc: drop "explicitly given" from push.default description
commit b7833910180d7d762ad0bb0f59cb02ba9ef86710
Merge: a74c38749 cf82bff73
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 12 12:41:36 2020 -0800
Merge branch 'jk/clang-sanitizer-fixes'
C pedantry ;-) fix.
* jk/clang-sanitizer-fixes:
obstack: avoid computing offsets from NULL pointer
xdiff: avoid computing non-zero offset from NULL pointer
avoid computing zero offsets from NULL pointer
merge-recursive: use subtraction to flip stage
merge-recursive: silence -Wxor-used-as-pow warning
commit a74c387495d1640537c5e163b053932ab1992156
Merge: 3f7553acf 7edee3298
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 12 12:41:35 2020 -0800
Merge branch 'dt/submodule-rm-with-stale-cache'
Running "git rm" on a submodule failed unnecessarily when
.gitmodules is only cache-dirty, which has been corrected.
* dt/submodule-rm-with-stale-cache:
git rm submodule: succeed if .gitmodules index stat info is zero
commit 3f7553acf50aaa2841899d34b19ff93eee64361f
Merge: 341f8a647 b54128bb0
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 12 12:41:35 2020 -0800
Merge branch 'jt/t5616-robustify'
Futureproofing a test not to depend on the current implementation
detail.
* jt/t5616-robustify:
t5616: make robust to delta base change
commit 341f8a6476d1d25c3906696489d87fc381739b59
Merge: b486d2ee8 39e21c6ef
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 12 12:41:35 2020 -0800
Merge branch 'jk/escaped-wildcard-dwim'
Disambiguation logic to tell revisions and pathspec apart has been
tweaked so that backslash-escaped glob special characters do not
count in the "wildcards are pathspec" rule.
* jk/escaped-wildcard-dwim:
verify_filename(): handle backslashes in "wildcards are pathspecs" rule
commit b486d2ee811d7471e7a31cd315eddca1be79fc19
Merge: de93cc14a 60440d72d
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 12 12:41:35 2020 -0800
Merge branch 'jn/pretend-object-doc'
Warn programmers about pretend_object_file() that allows the code
to tentatively use in-core objects.
* jn/pretend-object-doc:
sha1-file: document how to use pretend_object_file
commit 076ee3e8a2a631671dea5787924ed3181c5a919c
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed Feb 12 11:27:55 2020 +0000
tests: fix --write-junit-xml with subshells
In t0000, more precisely in its `test_bool_env` test case, there are two
subshells that are supposed to fail. To be even _more_ precise, they
fail by calling the `error` function, and that is okay, because it is in
a subshell, and it is expected that those two subshell invocations fail.
However, the `error` function also tries to finalize the JUnit XML (if
that XML was asked for, via `--write-junit-xml`. As a consequence, the
XML is edited to add a `time` attribute for the `testsuite` tag. And
since there are two expected `error` calls in addition to the final
`test_done`, the `finalize_junit_xml` function is called three times and
naturally the `time` attribute is added _three times_.
Azure Pipelines is not happy with that, complaining thusly:
##[warning]Failed to read D:\a\1\s\t\out\TEST-t0000-basic.xml. Error : 'time' is a duplicate attribute name. Line 2, position 82..
One possible way to address this would be to unset `write_junit_xml` in
the `test_bool_env` test case.
But that would be fragile, as other `error` calls in subshells could be
introduced.
So let's just modify `finalize_junit_xml` to remove any `time` attribute
before adding the authoritative one.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit ab9890fbcb38a688d72140dbbbc8468742ecd918
Merge: 32ccd29dc f696a2b1c
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 11 13:04:30 2020 -0800
Merge branch 'jk/mailinfo-cleanup' into next
Code clean-up.
* jk/mailinfo-cleanup:
mailinfo: factor out some repeated header handling
mailinfo: be more liberal with header whitespace
mailinfo: simplify parsing of header values
mailinfo: treat header values as C strings
commit 32ccd29dc591c5e52687542b4aac3df7a8aafa22
Merge: 904bca086 2b0f19fa7
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 11 13:04:29 2020 -0800
Merge branch 'js/convert-typofix' into next
Typofix.
* js/convert-typofix:
convert: fix typo
commit 904bca086eff85f13182f1f7d41664d93bcd1d07
Merge: 5c89aa002 145d59f48
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 11 13:04:29 2020 -0800
Merge branch 'mr/show-config-scope' into next
"git config" learned to show in which "scope", in addition to in
which file, each config setting comes from.
* mr/show-config-scope:
config: add '--show-scope' to print the scope of a config value
submodule-config: add subomdule config scope
config: teach git_config_source to remember its scope
config: preserve scope in do_git_config_sequence
config: clarify meaning of command line scoping
config: split repo scope to local and worktree
config: make scope_name non-static and rename it
t1300: create custom config file without special characters
t1300: fix over-indented HERE-DOCs
config: fix typo in variable name
commit 5c89aa002fcdd161329dc94c7234cae3d3176dfd
Merge: a1685687a 517b60564
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 11 13:04:28 2020 -0800
Merge branch 'rs/strbuf-insertstr' into next
Code clean-up.
* rs/strbuf-insertstr:
mailinfo: don't insert header prefix for handle_content_type()
strbuf: add and use strbuf_insertstr()
commit a1685687abe351b91717b0b03f5f28ecdb4985c0
Merge: 4fec29107 7a9f8ca80
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 11 13:04:28 2020 -0800
Merge branch 'rs/parse-options-concat-dup' into next
Code clean-up.
* rs/parse-options-concat-dup:
parse-options: simplify parse_options_dup()
parse-options: const parse_options_concat() parameters
parse-options: factor out parse_options_count()
parse-options: use COPY_ARRAY in parse_options_concat()
commit 4fec29107e58503571c95c120d0c9042059f670e
Merge: 79af4f7bd 30183894e
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 11 13:04:28 2020 -0800
Merge branch 'js/ci-squelch-doc-warning' into next
Squelch unhelpful warning message during documentation build.
* js/ci-squelch-doc-warning:
ci: ignore rubygems warning in the "Documentation" job
commit 79af4f7bdaac7ea84b966e892def5599255c18ee
Merge: 202d447e7 eb31044ff
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 11 13:04:27 2020 -0800
Merge branch 'jb/multi-pack-index-docfix' into next
Doc fix.
* jb/multi-pack-index-docfix:
pack-format: correct multi-pack-index description
commit 202d447e7833778b5f21899214ecf2452827ca55
Merge: ca03a3613 9299f8492
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 11 13:04:26 2020 -0800
Merge branch 'ma/diff-doc-clarify-regexp-example' into next
Doc clarification.
* ma/diff-doc-clarify-regexp-example:
diff-options.txt: avoid "regex" overload in example
commit ca03a361347f02d5e5a682bee8a31f690521e792
Merge: b8af267e1 7378ec90e
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 11 13:04:26 2020 -0800
Merge branch 'ms/doc-bundle-format' into next
Technical details of the bundle format has been documented.
* ms/doc-bundle-format:
doc: describe Git bundle format
commit b8af267e1b76f92e77b74167953539695694e2d2
Merge: 127748e61 303b3c1c4
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 11 13:04:25 2020 -0800
Merge branch 'es/submodule-fetch-message-fix' into next
Error message fix.
* es/submodule-fetch-message-fix:
submodule: add newline on invalid submodule error
commit 127748e61a4acb4c7441446fe6cf5aed3c79dc3b
Merge: 17616cb9b f3037657e
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 11 13:04:25 2020 -0800
Merge branch 'bc/hash-independent-tests-part-8' into next
Preparation for SHA-256 migration continues.
* bc/hash-independent-tests-part-8: (21 commits)
t6024: update for SHA-256
t6006: make hash size independent
t6000: abstract away SHA-1-specific constants
t5703: make test work with SHA-256
t5607: make hash size independent
t5318: update for SHA-256
t5515: make test hash independent
t5321: make test hash independent
t5313: make test hash independent
t5309: make test hash independent
t5302: make hash size independent
t4060: make test work with SHA-256
t4211: add test cases for SHA-256
t4211: move SHA-1-specific test cases into a directory
t4013: make test hash independent
t3311: make test work with SHA-256
t3310: make test work with SHA-256
t3309: make test work with SHA-256
t3308: make test work with SHA-256
t3206: make hash size independent
...
commit 17616cb9b16b7a29e40939ede4f3040c5fcf4530
Merge: 58058cc68 079f97097
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 11 13:04:24 2020 -0800
Merge branch 'rs/name-rev-memsave' into next
Memory footprint and performance of "git name-rev" has been
improved.
* rs/name-rev-memsave:
name-rev: sort tip names before applying
name-rev: release unused name strings
name-rev: generate name strings only if they are better
name-rev: pre-size buffer in get_parent_name()
name-rev: factor out get_parent_name()
name-rev: put struct rev_name into commit slab
name-rev: don't _peek() in create_or_update_name()
name-rev: don't leak path copy in name_ref()
name-rev: respect const qualifier
name-rev: remove unused typedef
name-rev: rewrite create_or_update_name()
commit 58058cc68c3e1e20d3b4e764394474c0be8ab2e8
Merge: 5c85173df 395518cf7
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 11 13:04:24 2020 -0800
Merge branch 'jb/parse-options-message-fix' into next
Error message fix.
* jb/parse-options-message-fix:
parse-options: lose an unnecessary space in an error message
commit c444f032e43611b95612882cd06380866f8da0fd
Author: Eyal Soha <shawarmakarma@gmail.com>
Date: Tue Jan 21 08:56:23 2020 -0800
color.c: alias RGB colors 8-15 to aixterm colors
This results in shorter output, and is _probably_ more portable. There
is at least one environment (GitHub Actions) which supports 16-color
mode but not 256-color mode. It's possible there are environments
which go the other way, but it seems unlikely.
Signed-off-by: Eyal Soha <shawarmakarma@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
![[bug history graph]](https://qa.debian.org/data/bts/graphs/g/git.png){kind=link}