vcswatch reports that
this package seems to have a new changelog entry (version
1:2.28.0+next.20201004-1, distribution
experimental) and new commits
in its VCS. You should consider whether it's time to make
an upload.
Here are the relevant commit messages:
commit ce0dc1b2132102c04a22b4d7bd79f28e87d9cba8
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun Oct 4 16:17:57 2020 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: I5f9dc12b40f940161198e1626eb494e679e3034b
commit 016fe9674ae81a9ef10b680f1d8810e9d9375552
Merge: 575f3733ca a647a8990f
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun Oct 4 16:16:57 2020 -0700
Merge branch 'next' into debian-experimental
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Change-Id: I26727dbcb2949dccec0ad01b1dde9c39805a6378
commit a647a8990fd795b1b3d31ce68fa110604854bd30
Merge: fd505ccfc1 ab4691b67b
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:51:46 2020 -0700
Sync with master
commit fd505ccfc1aee99f490ddc2875543b091dfe43e5
Merge: b736873ada e2b9cb1c5a
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:51:09 2020 -0700
Merge branch 'pm/gitk-update' into next
"gitk" update.
* pm/gitk-update:
gitk: Resize panes correctly when reducing window size
gitk: replace tabs with spaces
gitk: fix the context menu not appearing in the presence of submodule diffs
gitk: Un-hide selection in areas with non-default background color
gitk: add diff lines background colors
gitk: be prepared to be run in a bare repository
gitk: Preserve window dimensions on exit when not using ttk themes
gitk: don't highlight files after submodules as submodules
gitk: fix branch name encoding error
gitk: rename "commit summary" to "commit reference"
commit b736873ada227bb222b62eceb6cf60c0f5476b64
Merge: ab8f65b8c5 8791bf1841
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:51:09 2020 -0700
Merge branch 'ds/in-merge-bases-many-optim-bug' into next
in_merge_bases_many(), a way to see if a commit is reachable from
any commit in a set of commits, was totally broken when the
commit-graph feature was in use, which has been corrected.
* ds/in-merge-bases-many-optim-bug:
commit-reach: fix in_merge_bases_many bug
commit ab8f65b8c5124a5144698ac1388f1d2bc0bf4f70
Merge: 20438c1143 7efba5fa39
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:51:08 2020 -0700
Merge branch 'jk/format-auto-base-when-able' into next
"git format-patch" learns to take "whenAble" as a possible value
for the format.useAutoBase configuration variable to become no-op
when the automatically computed base does not make sense.
* jk/format-auto-base-when-able:
format-patch: teach format.useAutoBase "whenAble" option
commit 20438c11430dfab242a5ca90361f5b6809b939e6
Merge: 637072574f 5ce40d91f7
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:51:07 2020 -0700
Merge branch 'mt/parallel-checkout-part-1' into next
Parallel checkout.
* mt/parallel-checkout-part-1:
ci: run test round with parallel-checkout enabled
parallel-checkout: add tests related to .gitattributes
parallel-checkout: add tests related to clone collisions
parallel-checkout: add tests for basic operations
checkout-index: add parallel checkout support
builtin/checkout.c: complete parallel checkout support
make_transient_cache_entry(): optionally alloc from mem_pool
parallel-checkout: support progress displaying
parallel-checkout: make it truly parallel
unpack-trees: add basic support for parallel checkout
entry: add checkout_entry_ca() which takes preloaded conv_attrs
entry: move conv_attrs lookup up to checkout_entry()
entry: extract cache_entry update from write_entry()
entry: make fstat_output() and read_blob_entry() public
entry: extract a header file for entry.c functions
convert: add conv_attrs classification
convert: add get_stream_filter_ca() variant
convert: add [async_]convert_to_working_tree_ca() variants
convert: make convert_attrs() and convert structs public
commit 637072574f05596cff629653dc946f0902129ad6
Merge: 2948e90fab 957876f17d
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:51:07 2020 -0700
Merge branch 'jk/diff-cc-oidfind-fix' into next
"log -c --find-object=X" did not work well to find a merge that
involves a change to an object X from only one parent.
* jk/diff-cc-oidfind-fix:
combine-diff: handle --find-object in multitree code path
commit 2948e90fabc369d128b7ea09b90216f90753c521
Merge: c2a46f390c c0192df630
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:51:06 2020 -0700
Merge branch 'jk/refspecs-negative' into next
"git fetch" and "git push" support negative refspecs.
* jk/refspecs-negative:
refspec: add support for negative refspecs
commit c2a46f390ca6d34123fa23b9620873e9cb7125d5
Merge: fffc088553 e841a79a13
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:51:06 2020 -0700
Merge branch 'ds/maintenance-part-2' into next
"git maintenance", an extended big brother of "git gc", continues
to evolve.
* ds/maintenance-part-2:
maintenance: add incremental-repack auto condition
maintenance: auto-size incremental-repack batch
maintenance: add incremental-repack task
midx: use start_delayed_progress()
midx: enable core.multiPackIndex by default
maintenance: create auto condition for loose-objects
maintenance: add loose-objects task
maintenance: add prefetch task
commit fffc088553843a410f6e43a576cad742ca5006d2
Merge: 77c4c6094c df368fae35
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:51:06 2020 -0700
Merge branch 'rs/archive-add-file' into next
"git archive" learns the "--add-file" option to include untracked
files into a snapshot from a tree-ish.
* rs/archive-add-file:
Makefile: use git-archive --add-file
archive: add --add-file
archive: read short blobs in archive.c::write_archive_entry()
commit ab4691b67bc1a2cd8d9068fb03e3fbd6979247d6
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:48:44 2020 -0700
Nineteenth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 26b42b4dd8edb5da12f4d83b4e1f77f90cb532d8
Merge: 2fa8aacc72 bda959c476
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:49:15 2020 -0700
Merge branch 'mt/delta-base-cache-races'
A race that leads to an access to a free'd data was corrected in
the codepath that reads pack files.
* mt/delta-base-cache-races:
packfile: fix memory leak in add_delta_base_cache()
packfile: fix race condition on unpack_entry()
commit 2fa8aacc723d4c76b84d449fa7cf0de6cf40e5ad
Merge: ea1f6118b7 63d24fa0b0
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:49:14 2020 -0700
Merge branch 'jk/shortlog-group-by-trailer'
"git shortlog" has been taught to group commits by the contents of
the trailer lines, like "Reviewed-by:", "Coauthored-by:", etc.
* jk/shortlog-group-by-trailer:
shortlog: allow multiple groups to be specified
shortlog: parse trailer idents
shortlog: rename parse_stdin_ident()
shortlog: de-duplicate trailer values
shortlog: match commit trailers with --group
trailer: add interface for iterating over commit trailers
shortlog: add grouping option
shortlog: change "author" variables to "ident"
commit ea1f6118b772d8d03302937afc16e71719d33587
Merge: d1b75045a0 10a758479e
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:49:13 2020 -0700
Merge branch 'jc/fmt-merge-msg-suppress-destination'
Docfix.
* jc/fmt-merge-msg-suppress-destination:
config/fmt-merge-msg.txt: drop space in quote
commit d1b75045a01e95bbdfc304060a5ba1f511b42328
Merge: 84cdeed1cb 71ccaa0993
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:49:12 2020 -0700
Merge branch 'tb/upload-pack-filters'
Hotfix.
* tb/upload-pack-filters:
config/uploadpack.txt: fix typo in `--filter=tree:<n>`
commit 84cdeed1cb70660b24bc574902483dc815c5918b
Merge: 741f1f8131 0512eabd91
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:49:10 2020 -0700
Merge branch 'jc/sequencer-stopped-sha-simplify'
Code simplification.
* jc/sequencer-stopped-sha-simplify:
sequencer: stop abbreviating stopped-sha file
commit 741f1f813171f6234c5269c9bd59e6a71ef4ab40
Merge: 03b0198e30 0bc18daa2f
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:49:09 2020 -0700
Merge branch 'au/complete-restore-s'
The command line completion (in contrib/) learned that "git restore
-s <TAB>" is often followed by a refname.
* au/complete-restore-s:
completion: complete refs after 'git restore -s'
completion: use "prev" variable instead of introducing "prevword"
commit 03b0198e304a18dcc83febefd58e30ab1f0aac1e
Merge: 9839cce4a7 5336d50696
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:49:09 2020 -0700
Merge branch 'al/ref-filter-merged-and-no-merged'
Hotfix.
* al/ref-filter-merged-and-no-merged:
ref-filter: plug memory leak in reach_filter()
commit 9839cce4a7d9c426b82d3b2198a503918d9c8894
Merge: f4cc68cbd0 287416dba6
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:49:09 2020 -0700
Merge branch 'eg/mailinfo-doc-scissors'
The explanation of the "scissors line" has been clarified.
* eg/mailinfo-doc-scissors:
Doc: show example scissors line
commit f4cc68cbd078d5c0dd707384c802510261c67a28
Merge: 03a01824a4 517ecb3161
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:49:08 2020 -0700
Merge branch 'mr/bisect-in-c-2'
Rewrite of the "git bisect" script in C continues.
* mr/bisect-in-c-2:
bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functions in C
bisect: call 'clear_commit_marks_all()' in 'bisect_next_all()'
bisect--helper: reimplement `bisect_autostart` shell function in C
bisect--helper: introduce new `write_in_file()` function
bisect--helper: use '-res' in 'cmd_bisect__helper' return
bisect--helper: BUG() in cmd_*() on invalid subcommand
commit 03a01824a4ee07cd06b152bbff45066d6cf5542b
Merge: 230ff3e997 73c6de06af
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:49:08 2020 -0700
Merge branch 'cc/bisect-start-fix'
"git bisect start X Y", when X and Y are not valid committish
object names, should take X and Y as pathspec, but didn't.
* cc/bisect-start-fix:
bisect: don't use invalid oid as rev when starting
commit 230ff3e9970755fe4ba2e69165eab1f61752f1d1
Merge: 86cca370e1 610e2b9240
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:49:07 2020 -0700
Merge branch 'jc/blame-ignore-fix'
"git blame --ignore-rev/--ignore-revs-file" failed to validate
their input are valid revision, and failed to take into account
that the user may want to give an annotated tag instead of a
commit, which has been corrected.
* jc/blame-ignore-fix:
blame: validate and peel the object names on the ignore list
t8013: minimum preparatory clean-up
commit 86cca370e1989e0cbcd412f8770883a20d86eee8
Merge: 94de88c986 176380fd11
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:49:06 2020 -0700
Merge branch 'jk/drop-unaligned-loads'
Compilation fix around type punning.
* jk/drop-unaligned-loads:
Revert "fast-export: use local array to store anonymized oid"
bswap.h: drop unaligned loads
commit 94de88c986712e79c20813ba54e797c4ca83137b
Merge: 5a25615d5c ef60e9f74b
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:49:04 2020 -0700
Merge branch 'js/no-builtins-on-disk-option'
The installation procedure learned to optionally omit "git-foo"
executable files for each 'foo' built-in subcommand, which are only
required by old timers that still rely on the age old promise that
prepending "git --exec-path" output to PATH early in their script
will keep the "git-foo" calls they wrote working.
The old attempt to remove these executables from the disk failed in
the 1.6 era; it may be worth attempting again, but I think it is
worth to keep this topic separate from such a policy change to help
it graduate early.
* js/no-builtins-on-disk-option:
ci: stop linking built-ins to the dashed versions
Optionally skip linking/copying the built-ins
msvc: copy the correct `.pdb` files in the Makefile target `install`
commit 5a25615d5c026580b3e5645b53f8397bd8c3e76d
Merge: 306ee63a70 9a8606465e
Author: Junio C Hamano <gitster@pobox.com>
Date: Sun Oct 4 12:49:04 2020 -0700
Merge branch 'ab/mediawiki-fixes'
Modernization and fixes to MediaWiki remote backend.
* ab/mediawiki-fixes:
remote-mediawiki: use "sh" to eliminate unquoted commands
remote-mediawiki: annotate unquoted uses of run_git()
remote-mediawiki: convert to quoted run_git() invocation
remote-mediawiki: provide a list form of run_git()
remote-mediawiki tests: annotate failing tests
remote-mediawiki: fix duplicate revisions being imported
remote-mediawiki tests: use CLI installer
remote-mediawiki tests: use inline PerlIO for readability
remote-mediawiki tests: replace deprecated Perl construct
remote-mediawiki tests: use a more idiomatic dispatch table
remote-mediawiki tests: use "$dir/" instead of "$dir."
remote-mediawiki tests: change `[]` to `test`
remote-mediawiki tests: use test_cmp in tests
remote-mediawiki tests: use a 10 character password
remote-mediawiki tests: use the login/password variables
remote-mediawiki doc: don't hardcode Debian PHP versions
remote-mediawiki doc: link to MediaWiki's current version
remote-mediawiki doc: correct link to GitHub project
commit e2b9cb1c5a45290f568681862fb27714d6e4e52b
Merge: 306ee63a70 6cd80496e9
Author: Junio C Hamano <gitster@pobox.com>
Date: Sat Oct 3 10:06:27 2020 -0700
Merge remote-tracking branch 'paulus/master' into pm/gitk-update
* paulus/master:
gitk: Resize panes correctly when reducing window size
gitk: replace tabs with spaces
gitk: fix the context menu not appearing in the presence of submodule diffs
gitk: Un-hide selection in areas with non-default background color
gitk: add diff lines background colors
gitk: be prepared to be run in a bare repository
gitk: Preserve window dimensions on exit when not using ttk themes
gitk: don't highlight files after submodules as submodules
gitk: fix branch name encoding error
gitk: rename "commit summary" to "commit reference"
commit 6cd80496e9d3694825ec941663b65c9516102289
Author: Paul Mackerras <paulus@ozlabs.org>
Date: Sat Oct 3 15:20:33 2020 +1000
gitk: Resize panes correctly when reducing window size
The resizeclistpanes and resizecdetpanes procedures attempt to keep
the horizontal proportions of the panes of the gitk window
approximately constant when the gitk window is resized. However, if
the size is reduced enough that an existing sash position would go
outside the window, Tk moves the sash to the left to keep it inside
the window (without moving other sash positions to keep the
proportions). This happens before these resize procedures get
control, and so they work with incorrect proportions.
To fix this, we record the sash positions we set previously and use
those previously-set sash positions rather than the current sash
positions when computing the proportions.
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
commit e244588eb6ceef86a6a183b3bb032960e26033bb
Author: Denton Liu <liu.denton@gmail.com>
Date: Thu Sep 10 21:36:33 2020 -0700
gitk: replace tabs with spaces
The source code is a mix of tabs and spaces. The indentation style
currently is four spaces per indent level but uses tabs every other
level (at eight spaces). Fix this inconsistent spacing and tabbing by
just using a space-indent for everything.
This was done mechanically by running:
$ expand -i gitk >gitk.new
$ mv gitk.new gitk
This patch should be empty with `--ignore-all-space`.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
commit 8791bf18414a37205127e184c04cad53a43aeff1
Author: Derrick Stolee <dstolee@microsoft.com>
Date: Fri Oct 2 14:58:56 2020 +0000
commit-reach: fix in_merge_bases_many bug
Way back in f9b8908b (commit.c: use generation numbers for
in_merge_bases(), 2018-05-01), a heuristic was used to short-circuit
the in_merge_bases() walk. This works just fine as long as the
caller is checking only two commits, but when there are multiple,
there is a possibility that this heuristic is _very wrong_.
Some code moves since then has changed this method to
repo_in_merge_bases_many() inside commit-reach.c. The heuristic
computes the minimum generation number of the "reference" list, then
compares this number to the generation number of the "commit".
In a recent topic, a test was added that used in_merge_bases_many()
to test if a commit was reachable from a number of commits pulled
from a reflog. However, this highlighted the problem: if any of the
reference commits have a smaller generation number than the given
commit, then the walk is skipped _even if there exist some with
higher generation number_.
This heuristic is wrong! It must check the MAXIMUM generation number
of the reference commits, not the MINIMUM.
This highlights a testing gap. t6600-test-reach.sh covers many
methods in commit-reach.c, including in_merge_bases() and
get_merge_bases_many(), but since these methods either restrict to
two input commits or actually look for the full list of merge bases,
they don't check this heuristic!
Add a possible input to "test-tool reach" that tests
in_merge_bases_many() and add tests to t6600-test-reach.sh that
cover this heuristic. This includes cases for the reference commits
having generation above and below the generation of the input commit,
but also having maximum generation below the generation of the input
commit.
The fix itself is to swap min_generation with a max_generation in
repo_in_merge_bases_many().
Reported-by: Srinidhi Kaushik <shrinidhi.kaushik@gmail.com>
Helped-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 7efba5fa39fa1608fccea51a849b36b0f85825bb
Author: Jacob Keller <jacob.keller@gmail.com>
Date: Thu Oct 1 14:46:53 2020 -0700
format-patch: teach format.useAutoBase "whenAble" option
The format.useAutoBase configuration option exists to allow users to
enable '--base=auto' for format-patch by default.
This can sometimes lead to poor workflow, due to unexpected failures
when attempting to format an ancient patch:
$ git format-patch -1 <an old commit>
fatal: base commit shouldn't be in revision list
This can be very confusing, as it is not necessarily immediately obvious
that the user requested a --base (since this was in the configuration,
not on the command line).
We do want --base=auto to fail when it cannot provide a suitable base,
as it would be equally confusing if a formatted patch did not include
the base information when it was requested.
Teach format.useAutoBase a new mode, "whenAble". This mode will cause
format-patch to attempt to include a base commit when it can. However,
if no valid base commit can be found, then format-patch will continue
formatting the patch without a base commit.
In order to avoid making yet another branch name unusable with --base,
do not teach --base=whenAble or --base=whenable.
Instead, refactor the base_commit option to use a callback, and rely on
the global configuration variable auto_base.
This does mean that a user cannot request this optional base commit
generation from the command line. However, this is likely not too
valuable. If the user requests base information manually, they will be
immediately informed of the failure to acquire a suitable base commit.
This allows the user to make an informed choice about whether to
continue the format.
Add tests to cover the new mode of operation for --base.
Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 77c4c6094c1d5cf0c0735b65c270ef75aa0596fd
Merge: 440a7a0a7a 23547c4051
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Oct 1 12:55:39 2020 -0700
Merge branch 'jt/keep-partial-clone-filter-upon-lazy-fetch' into next
The lazy fetching done internally to make missing objects available
in a partial clone incorrectly made permanent damage to the partial
clone filter in the repository, which has been corrected.
* jt/keep-partial-clone-filter-upon-lazy-fetch:
fetch: do not override partial clone filter
promisor-remote: remove unused variable
commit 440a7a0a7abff8af3062f38b6eb9e096b4fcb1ce
Merge: 4ae8bee636 842385b8a4
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Oct 1 12:55:38 2020 -0700
Merge branch 'jk/unused' into next
Code cleanup.
* jk/unused:
dir.c: drop unused "untracked" from treat_path_fast()
sequencer: handle ignore_footer when parsing trailers
test-advise: check argument count with argc instead of argv
sparse-checkout: fill in some options boilerplate
sequencer: drop repository argument from run_git_commit()
push: drop unused repo argument to do_push()
assert PARSE_OPT_NONEG in parse-options callbacks
env--helper: write to opt->value in parseopt helper
drop unused argc parameters
convert: drop unused crlf_action from check_global_conv_flags_eol()
commit 4ae8bee636ad727688bdd95d73fa22ed9a293dff
Merge: 40be8c6094 3ad0401e9e
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Oct 1 12:55:38 2020 -0700
Merge branch 'td/submodule-update-quiet' into next
"git submodule update --quiet" did not squelch underlying "rebase"
and "pull" commands.
* td/submodule-update-quiet:
submodule update: silence underlying merge/rebase with "--quiet"
commit 40be8c60944e491251e87915900c1d873f5afdaa
Merge: 369dcfb161 0ad621f61e
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Oct 1 12:55:37 2020 -0700
Merge branch 'js/cmake-vs' into next
Using the CMake support we added some time ago for real with Visual
Studio build revealed there were lot of usability improvements
possible, which have been carried out.
* js/cmake-vs:
hashmap_for_each_entry(): workaround MSVC's runtime check failure #3
cmake (Windows): recommend using Visual Studio's built-in CMake support
cmake (Windows): initialize vcpkg/build dependencies automatically
cmake (Windows): complain when encountering an unknown compiler
cmake (Windows): let the `.dll` files be found when running the tests
cmake: quote the path accurately when editing `test-lib.sh`
cmake: fall back to using `vcpkg`'s `msgfmt.exe` on Windows
cmake: ensure that the `vcpkg` packages are found on Windows
cmake: do find Git for Windows' shell interpreter
cmake: ignore files generated by CMake as run in Visual Studio
commit 369dcfb16113c69dd036c9254aba163b81b116f9
Merge: d45e33ebb0 a46d1f7321
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Oct 1 12:55:37 2020 -0700
Merge branch 'ma/worktree-cleanups' into next
Code clean-up.
* ma/worktree-cleanups:
worktree: use skip_prefix to parse target
worktree: rename copy-pasted variable
worktree: update renamed variable in comment
worktree: inline `worktree_ref()` into its only caller
wt-status: introduce wt_status_state_free_buffers()
wt-status: print to s->fp, not stdout
wt-status: replace sha1 mentions with oid
commit 3ad0401e9e6d3e243a21a3f376e36453572dcf0d
Author: Theodore Dubois <tbodt@google.com>
Date: Wed Sep 30 12:50:53 2020 -0700
submodule update: silence underlying merge/rebase with "--quiet"
Commands such as
$ git pull --rebase --recurse-submodules --quiet
produce non-quiet output from the merge or rebase. Pass the --quiet
option down when invoking "rebase" and "merge".
Also fix the parsing of git submodule update -v.
When e84c3cf3 (git-submodule.sh: accept verbose flag in cmd_update
to be non-quiet, 2018-08-14) taught "git submodule update" to take
"--quiet", it apparently did not know how ${GIT_QUIET:+--quiet}
works, and reviewers seem to have missed that setting the variable
to "0", rather than unsetting it, still results in "--quiet" being
passed to underlying commands.
Signed-off-by: Theodore Dubois <tbodt@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit d45e33ebb0c34c6cbe446f00a6496f927d4503b8
Merge: 3fb4047ce3 d01141de5a
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 30 16:13:12 2020 -0700
Merge branch 'so/combine-diff-simplify' into next
Code simplification.
* so/combine-diff-simplify:
diff: get rid of redundant 'dense' argument
commit 3fb4047ce30ff3413df86b1622539acf5e60b254
Merge: fda3e44958 f33f2d3d54
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 30 16:13:11 2020 -0700
Merge branch 'js/default-branch-name-part-2' into next
Update the tests to drop word 'master' from them.
* js/default-branch-name-part-2:
t9902: avoid using the branch name `master`
tests: avoid variations of the `master` branch name
t3200: avoid variations of the `master` branch name
fast-export: avoid using unnecessary language in a code comment
t/test-terminal: avoid non-inclusive language
commit c0192df6306d4d9ad77f6015a053925b13155834
Author: Jacob Keller <jacob.keller@gmail.com>
Date: Wed Sep 30 14:25:29 2020 -0700
refspec: add support for negative refspecs
Both fetch and push support pattern refspecs which allow fetching or
pushing references that match a specific pattern. Because these patterns
are globs, they have somewhat limited ability to express more complex
situations.
For example, suppose you wish to fetch all branches from a remote except
for a specific one. To allow this, you must setup a set of refspecs
which match only the branches you want. Because refspecs are either
explicit name matches, or simple globs, many patterns cannot be
expressed.
Add support for a new type of refspec, referred to as "negative"
refspecs. These are prefixed with a '^' and mean "exclude any ref
matching this refspec". They can only have one "side" which always
refers to the source. During a fetch, this refers to the name of the ref
on the remote. During a push, this refers to the name of the ref on the
local side.
With negative refspecs, users can express more complex patterns. For
example:
git fetch origin refs/heads/*:refs/remotes/origin/* ^refs/heads/dontwant
will fetch all branches on origin into remotes/origin, but will exclude
fetching the branch named dontwant.
Refspecs today are commutative, meaning that order doesn't expressly
matter. Rather than forcing an implied order, negative refspecs will
always be applied last. That is, in order to match, a ref must match at
least one positive refspec, and match none of the negative refspecs.
This is similar to how negative pathspecs work.
Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 957876f17d75b5cd0e94b85d3df843bb1e9ae110
Author: Jeff King <peff@peff.net>
Date: Wed Sep 30 07:52:40 2020 -0400
combine-diff: handle --find-object in multitree code path
When doing combined diffs, we have two possible code paths:
- a slower one which independently diffs against each parent, applies
any filters, and then intersects the resulting paths
- a faster one which walks all trees simultaneously
When the diff options specify that we must do certain filters, like
pickaxe, then we always use the slow path, since the pickaxe code only
knows how to handle filepairs, not the n-parent entries generated for
combined diffs.
But there are two problems with the slow path:
1. It's slow. Running:
git rev-list HEAD | git diff-tree --stdin -r -c
in git.git takes ~3s on my machine. But adding "--find-object" to
that increases it to ~6s, even though find-object itself should
incur only a few extra oid comparisons. On linux.git, it's even
worse: 35s versus 215s.
2. It doesn't catch all cases where a particular path is interesting.
Consider a merge with parent blobs X and Y for a particular path,
and end result Z. That should be interesting according to "-c",
because the result doesn't match either parent. And it should be
interesting even with "--find-object=X", because "X" went away in
the merge.
But because we perform each pairwise diff independently, this
confuses the intersection code. The change from X to Z is still
interesting according to --find-object. But in the other parent we
went from Y to Z, so the diff appears empty! That causes the
intersection code to think that parent didn't change the path, and
thus it's not interesting for "-c".
This patch fixes both by implementing --find-object for the multitree
code. It's a bit unfortunate that we have to duplicate some logic from
diffcore-pickaxe, but this is the best we can do for now. In an ideal
world, all of the diffcore code would stop thinking about filepairs and
start thinking about n-parent sets, and we could use the multitree walk
with all of it.
Until then, there are some leftover warts:
- other pickaxe operations, like -S or -G, still suffer from both
problems. These would be hard to adapt because they rely on having
a diff_filespec() for each path to look at content. And we'd need to
define what an n-way "change" means in each case (probably easy for
"-S", which can compare counts, but not so clear for -G, which is
about grepping diffs).
- other options besides --find-object may cause us to use the slow
pairwise path, in which case we'll go back to producing a different
(wrong) answer for the X/Y/Z case above.
We may be able to hack around these, but I think the ultimate solution
will be a larger rewrite of the diffcore code. For now, this patch
improves one specific case but leaves the rest.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 0ad621f61e4b2adc3a7bad088c25ebf2c8b9f43d
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Sep 30 15:26:24 2020 +0000
hashmap_for_each_entry(): workaround MSVC's runtime check failure #3
The OFFSETOF_VAR(var, member) macro is implemented in terms of
offsetof(typeof(*var), member) with compilers that know typeof(),
but its fallback implemenation compares &(var->member) and (var) and
count the distance in bytes, i.e.
((uintptr_t)&(var)->member - (uintptr_t)(var))
MSVC's runtime check, when fed an uninitialized 'var', flags this as
a use of an uninitialized variable (and that is legit---uninitialized
contents of 'var' is subtracted) in a debug build.
After auditing all 6 uses of OFFSETOF_VAR(), 1 of them does feed a
potentially uninitialized 'var' to the macro in the beginning of the
for() loop:
#define hashmap_for_each_entry(map, iter, var, member) \
for (var = hashmap_iter_first_entry_offset(map, iter, \
OFFSETOF_VAR(var, member)); \
var; \
var = hashmap_iter_next_entry_offset(iter, \
OFFSETOF_VAR(var, member)))
We can work around this by making sure that var has _some_ value
when OFFSETOF_VAR() is called. Strictly speaking, it invites
undefined behaviour to use NULL here if we end up with pointer
comparison, but MSVC runtime seems to be happy with it, and most
other systems have typeof() and don't even need pointer comparison
fallback code.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit f2f1250c47fd967b7678cad329438e8deac62038
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed Sep 30 15:26:23 2020 +0000
cmake (Windows): recommend using Visual Studio's built-in CMake support
It is a lot more convenient to use than having to specify the
configuration in CMake manually (does not matter whether using the
command-line or CMake's GUI).
While at it, recommend using `contrib/buildsystems/out/` as build
directory also in the part that talks about running CMake manually.
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit b490283d5200952b87f49ac43457da7a332b4598
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed Sep 30 15:26:22 2020 +0000
cmake (Windows): initialize vcpkg/build dependencies automatically
The idea of having CMake support in Git's source tree is to enable
contributors on Windows to start contributing with little effort. To
that end, we just added some sensible defaults that will let users open
the worktree in Visual Studio and start building.
This expects the dependencies (such as zlib) to be available already,
though. If they are not available, we expect the user to run
`compat/vcbuild/vcpkg_install.bat`.
Rather than requiring this step to be manual, detect the situation and
run it as part of the CMake configuration step.
Note that this obviously only applies to the scenario when we want to
compile in Visual Studio (i.e. with MS Visual C), not with GCC.
Therefore, we guard this new code block behind the `MSVC` conditional.
This concludes our journey to make it as effortless as possible to start
developing Git in Visual Studio: all the developer needs to do is to
clone Git's repository, open the worktree via `File>Open>Folder...` and
wait for CMake to finish configuring.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 2d9eb4ed2cd8a0105c65167fdc9ddb0ddcde42c5
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed Sep 30 15:26:21 2020 +0000
cmake (Windows): complain when encountering an unknown compiler
We have some custom handling regarding the link options, which are
specific to each compiler.
Therefore: let's not just continue without setting the link options if
configuring for a currently unhandled compiler, but error out.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 8c35e82898f6418bb010c2f3bb5025b52023ba91
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed Sep 30 15:26:20 2020 +0000
cmake (Windows): let the `.dll` files be found when running the tests
Contrary to Unix-ish platforms, the dependencies' shared libraries are
not usually found in one central place. In our case, since we use
`vcpkg`, they are to be found inside the `compat/vcbuild/vcpkg/` tree.
Let's make sure that they are in the search path when running the tests.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit f1bd7379570d74f5ea70ef8bb89fa82d9a219c8e
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed Sep 30 15:26:19 2020 +0000
cmake: quote the path accurately when editing `test-lib.sh`
By default, the build directory will be called something like
`contrib/buildsystems/out/build/x64-Debug (default)` (note the space and
the parentheses). We need to make sure that such a path is quoted
properly when editing the assignment of the `GIT_BUILD_DIR` variable.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 8f4513872517b72fb49d914ee9af8d44c836fc5a
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed Sep 30 15:26:18 2020 +0000
cmake: fall back to using `vcpkg`'s `msgfmt.exe` on Windows
We are already relying on `vcpkg` to manage our dependencies, including
`libiconv`. Let's also use the `msgfmt.exe` from there.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 842385b8a4fa56678f13cda599ee96463004e7bf
Author: Jeff King <peff@peff.net>
Date: Wed Sep 30 08:35:00 2020 -0400
dir.c: drop unused "untracked" from treat_path_fast()
We don't use the untracked_cache_dir parameter that is passed in, but
instead look at the untracked_cache_dir inside the cached_dir struct we
are passed. It's been this way since the introduction of
treat_path_fast() in 91a2288b5f (untracked cache: record/validate dir
mtime and reuse cached output, 2015-03-08).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 9dad073d4b9b6679c3e86f28aacf79f85ed786d2
Author: Jeff King <peff@peff.net>
Date: Wed Sep 30 08:34:11 2020 -0400
sequencer: handle ignore_footer when parsing trailers
The append_signoff() function takes an "ignore_footer"
argument, which specifies a number of bytes at the end of
the message buffer which should not be considered (they
cannot contain trailers, and the trailer is spliced in
before them).
But to find the existing trailers, it calls into
has_conforming_trailer(). That function takes an
ignore_footer parameter, but since 967dfd4d56 (sequencer:
use trailer's trailer layout, 2016-11-02) the parameter is
completely ignored.
The trailer interface we're using takes a single string,
with no option to tell it to use part of the string.
However, since we have a mutable strbuf, we can work around
this by simply overwriting (and later restoring) the
boundary with a NUL.
I'm not sure if this can actually trigger a bug in practice.
It's easy to get a non-zero ignore_footer by doing something
like this:
git commit -F - --cleanup=verbatim <<-EOF
subject
body
Signed-off-by: me
# this looks like a comment, but is actually in the
# message! That makes the earlier s-o-b fake.
EOF
git commit --amend -s
There git-commit calls ignore_non_trailer() to count up the
"#" cruft, which becomes the ignore_footer header. But it
works even without this patch! That's because the trailer
code _also_ calls ignore_non_trailer() and skips the cruft,
too. So it happens to work because the only callers with a
non-zero ignore_footer are using the exact same function
that the trailer parser uses internally.
And that seems true for all of the current callers, but
there's nothing guaranteeing it. We're better off only
feeding the correct buffer to the trailer code in the first
place.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 26e28fe7bbdf8b22ed096dfd76a9311e86ffb200
Author: Jeff King <peff@peff.net>
Date: Wed Sep 30 08:30:27 2020 -0400
test-advise: check argument count with argc instead of argv
We complain if "test-tool advise" is not given an argument, but we
quietly ignore any additional arguments it receives. Let's instead check
that we got the expected number. As a bonus, this silences
-Wunused-parameter, which notes that we don't ever look at argc.
While we're here, we can also fix the indentation in the conditional.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 75d3bee15778a3aaeb8234023fc224838ac53181
Author: Jeff King <peff@peff.net>
Date: Wed Sep 30 08:30:10 2020 -0400
sparse-checkout: fill in some options boilerplate
The sparse-checkout passes along argv and argc to its sub-command helper
functions. Many of these sub-commands do not yet take any command-line
options, and ignore those parameters.
Let's instead add empty option lists and make sure we call
parse_options(). That will give a useful error message for something
like:
git sparse-checkout list --nonsense
which currently just silently ignores the unknown option.
As a bonus, it also silences some -Wunused-parameter warnings.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 20f4b044a681fffd469cc9ddcf055580a20fd612
Author: Jeff King <peff@peff.net>
Date: Wed Sep 30 08:29:31 2020 -0400
sequencer: drop repository argument from run_git_commit()
When we switched to using an external git-commit call in b0a3186140
(sequencer: simplify root commit creation, 2019-08-19), this function
didn't need to care about the repository object any more.
Arguably we could be passing along the repository path to the external
git-commit by using "--git-dir=r->path" here. But for the most part the
sequencer code relies on sub-process finding the same repository we're
already in (using the same environment variables or discovery process we
did). But we don't have a convenient interface for doing so, and there's
no indication that we need to. Let's just drop the unused parameter for
now.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 5b9427e0ac4d4b6c96f23fc5eb9b047a27563c65
Author: Jeff King <peff@peff.net>
Date: Wed Sep 30 08:29:09 2020 -0400
push: drop unused repo argument to do_push()
We stopped using the "repo" argument in 8e4c8af058 (push: disallow --all
and refspecs when remote.<name>.mirror is set, 2019-09-02), which moved
the pushremote handling to its caller.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 8d2aa8dfac4048c964453a8983f1dc12ecdfe1c3
Author: Jeff King <peff@peff.net>
Date: Wed Sep 30 08:29:02 2020 -0400
assert PARSE_OPT_NONEG in parse-options callbacks
In the spirit of 517fe807d6 (assert NOARG/NONEG behavior of
parse-options callbacks, 2018-11-05), let's cover some parse-options
callbacks which expect to be used with PARSE_OPT_NONEG but don't
explicitly assert that this is the case. These callbacks are all used
correctly in the current code, but this will help document their
expectations and future-proof the code.
As a bonus, it also silences -Wunused-parameters (these were added since
the initial sweep of 517fe807d6, and we can't yet turn on
-Wunused-parameters to remind people because it has too many existing
false positives).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 424e28fcadfe0a40e444687c10fb4eaff8360f8d
Author: Jeff King <peff@peff.net>
Date: Wed Sep 30 08:28:32 2020 -0400
env--helper: write to opt->value in parseopt helper
We use OPT_CALLBACK_F() to call the option_parse_type() callback,
passing it the address of "cmdmode" as the value to write to. But the
callback doesn't look at opt->value at all, and instead writes to a
global variable.
This works out because that's the same global variable we happen to pass
in, but it's rather confusing. Let's use the passed-in value instead.
We'll also make "cmdmode" a local variable of the main function,
ensuring we can't make the same mistake again.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit e885a84f1bc660adfc1dea5f6c25d0a92c7c9dbc
Author: Jeff King <peff@peff.net>
Date: Wed Sep 30 08:28:18 2020 -0400
drop unused argc parameters
Many functions take an argv/argc pair, but never actually look at argc.
This makes it useless at best (we use the NULL sentinel in argv to find
the end of the array), and misleading at worst (what happens if the argc
count does not match the argv NULL?).
In each of these instances, the argv NULL does match the argc count, so
there are no bugs here. But let's tighten the interfaces to make it
harder to get wrong (and to reduce some -Wunused-parameter complaints).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 185e86522678fed077d6cec02381bcf899bf24e5
Author: Jeff King <peff@peff.net>
Date: Wed Sep 30 08:27:53 2020 -0400
convert: drop unused crlf_action from check_global_conv_flags_eol()
The crlf_action parameter hasn't been used since a0ad53c181 (convert:
Correct NNO tests and missing `LF will be replaced by CRLF`,
2016-08-13), where that part of the function was hoisted out to a
separate will_convert_lf_to_crlf() helper. Let's drop the useless
parameter.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit fda3e449589e6e1698cd98ab4cab9214fe925eec
Merge: ee2d60c077 306ee63a70
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 14:05:42 2020 -0700
Sync with master
commit ee2d60c077bf7d6b28350fd1ef918488b089735a
Merge: 3706b06db5 bda959c476
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 14:05:09 2020 -0700
Merge branch 'mt/delta-base-cache-races' into next
A race that leads to an access to a free'd data was corrected in
the codepath that reads pack files.
* mt/delta-base-cache-races:
packfile: fix memory leak in add_delta_base_cache()
packfile: fix race condition on unpack_entry()
commit 3706b06db5ab3414e7e2a53879043f50b5cc0dd8
Merge: 2b1f8ee654 63d24fa0b0
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 14:05:08 2020 -0700
Merge branch 'jk/shortlog-group-by-trailer' into next
"git shortlog" has been taught to group commits by the contents of
the trailer lines, like "Reviewed-by:", "Coauthored-by:", etc.
* jk/shortlog-group-by-trailer:
shortlog: allow multiple groups to be specified
shortlog: parse trailer idents
shortlog: rename parse_stdin_ident()
shortlog: de-duplicate trailer values
shortlog: match commit trailers with --group
trailer: add interface for iterating over commit trailers
shortlog: add grouping option
shortlog: change "author" variables to "ident"
commit 2b1f8ee65426fa36df4341cc98a1a20ae2eb2d02
Merge: 3dde767170 10a758479e
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 14:05:07 2020 -0700
Merge branch 'jc/fmt-merge-msg-suppress-destination' into next
Docfix.
* jc/fmt-merge-msg-suppress-destination:
config/fmt-merge-msg.txt: drop space in quote
commit 3dde767170ba6efe23bbc5eeee548530355f5e66
Merge: 9af3360572 71ccaa0993
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 14:05:06 2020 -0700
Merge branch 'tb/upload-pack-filters' into next
Hotfix.
* tb/upload-pack-filters:
config/uploadpack.txt: fix typo in `--filter=tree:<n>`
commit 9af3360572069b937a146cbf552a12d7e24b7c91
Merge: 7bbf508562 0512eabd91
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 14:05:05 2020 -0700
Merge branch 'jc/sequencer-stopped-sha-simplify' into next
Code simplification.
* jc/sequencer-stopped-sha-simplify:
sequencer: stop abbreviating stopped-sha file
commit 7bbf508562b63049ed118240e379300477e7a20b
Merge: 748a286753 0bc18daa2f
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 14:05:04 2020 -0700
Merge branch 'au/complete-restore-s' into next
The command line completion (in contrib/) learned that "git restore
-s <TAB>" is often followed by a refname.
* au/complete-restore-s:
completion: complete refs after 'git restore -s'
completion: use "prev" variable instead of introducing "prevword"
commit 748a286753194a1251a44760e177ae15966bdef9
Merge: 4694f22fe9 5336d50696
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 14:05:04 2020 -0700
Merge branch 'al/ref-filter-merged-and-no-merged' into next
Hotfix.
* al/ref-filter-merged-and-no-merged:
ref-filter: plug memory leak in reach_filter()
commit 4694f22fe91850a4bb4a739cd9d32aee45d74966
Merge: a15f1729d2 287416dba6
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 14:05:03 2020 -0700
Merge branch 'eg/mailinfo-doc-scissors' into next
The explanation of the "scissors line" has been clarified.
* eg/mailinfo-doc-scissors:
Doc: show example scissors line
commit a15f1729d2fce58182fa9ec8eb5cb2d1ad39b6b7
Merge: 637011d04a 517ecb3161
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 14:05:02 2020 -0700
Merge branch 'mr/bisect-in-c-2' into next
Rewrite of the "git bisect" script in C continues.
* mr/bisect-in-c-2:
bisect--helper: reimplement `bisect_next` and `bisect_auto_next` shell functions in C
bisect: call 'clear_commit_marks_all()' in 'bisect_next_all()'
bisect--helper: reimplement `bisect_autostart` shell function in C
bisect--helper: introduce new `write_in_file()` function
bisect--helper: use '-res' in 'cmd_bisect__helper' return
bisect--helper: BUG() in cmd_*() on invalid subcommand
commit 637011d04a1800ab612c2357d6f74a1ddf45adc4
Merge: 96fbdb57fb 73c6de06af
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 14:05:02 2020 -0700
Merge branch 'cc/bisect-start-fix' into next
"git bisect start X Y", when X and Y are not valid committish
object names, should take X and Y as pathspec, but didn't.
* cc/bisect-start-fix:
bisect: don't use invalid oid as rev when starting
commit 96fbdb57fbecb7f71ca154801491d81f90b3300e
Merge: 29c05387a0 610e2b9240
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 14:05:01 2020 -0700
Merge branch 'jc/blame-ignore-fix' into next
"git blame --ignore-rev/--ignore-revs-file" failed to validate
their input are valid revision, and failed to take into account
that the user may want to give an annotated tag instead of a
commit, which has been corrected.
* jc/blame-ignore-fix:
blame: validate and peel the object names on the ignore list
t8013: minimum preparatory clean-up
commit 29c05387a0cd70843a55be50e7c4c82365ff7acf
Merge: 665beee440 176380fd11
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 14:05:00 2020 -0700
Merge branch 'jk/drop-unaligned-loads' into next
Compilation fix around type punning.
* jk/drop-unaligned-loads:
Revert "fast-export: use local array to store anonymized oid"
bswap.h: drop unaligned loads
commit 306ee63a703ad67c54ba1209dc11dd9ea500dc1f
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 13:58:53 2020 -0700
Eighteenth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 299deeac8a67ef80989b86a75b012be1d2193bf9
Merge: ac4089da7b 54200cef86
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 14:01:22 2020 -0700
Merge branch 'ah/pull'
Earlier we taught "git pull" to warn when the user does not say the
histories need to be merged, rebased or accepts only fast-
forwarding, but the warning triggered for those who have set the
pull.ff configuration variable.
* ah/pull:
pull: don't warn if pull.ff has been set
commit ac4089da7bcf63698c239a16076a144e66de96a9
Merge: 71a9b82dd4 ff0c7fa8cb
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 14:01:21 2020 -0700
Merge branch 'tg/range-diff-same-file-fix'
"git range-diff" showed incorrect diffstat, which has been
corrected.
* tg/range-diff-same-file-fix:
diff: fix modified lines stats with --stat and --numstat
commit 71a9b82dd4ecc167caa099ea9e8ab6138a65f5fb
Merge: 9f489ac6bb 9f0be82123
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 14:01:21 2020 -0700
Merge branch 'jc/t1506-rev-parse-leaves-range-endpoint-unpeeled'
Test update.
* jc/t1506-rev-parse-leaves-range-endpoint-unpeeled:
t1506: rev-parse A..B and A...B
commit 9f489ac6bbb755fa4c83289e44cad12f3b765d69
Merge: e76ae33009 d8d3d632f4
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 14:01:21 2020 -0700
Merge branch 'dl/zero-oid-in-hooks'
Adjust sample hooks for hash algorithm other than SHA-1.
* dl/zero-oid-in-hooks:
hooks--update.sample: use hash-agnostic zero OID
hooks--pre-push.sample: use hash-agnostic zero OID
hooks--pre-push.sample: modernize script
commit e76ae330099f97d3a868cacf311f420203f51a67
Merge: b28919c7bc eb049759fb
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 14:01:20 2020 -0700
Merge branch 'jk/make-protocol-v2-the-default'
The transport protocol v2 has become the default again.
* jk/make-protocol-v2-the-default:
protocol: re-enable v2 protocol by default
commit b28919c7bcfabad81896070e6b7b66be8310e6a8
Merge: 288ed98bf7 47ac970309
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 14:01:20 2020 -0700
Merge branch 'bc/clone-with-git-default-hash-fix'
"git clone" that clones from SHA-1 repository, while
GIT_DEFAULT_HASH set to use SHA-256 already, resulted in an
unusable repository that half-claims to be SHA-256 repository
with SHA-1 objects and refs. This has been corrected.
* bc/clone-with-git-default-hash-fix:
builtin/clone: avoid failure with GIT_DEFAULT_HASH
commit 288ed98bf768f4df9b569d51a52c233a1402c0f5
Merge: c5a8f1efc0 d356d5debe
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 14:01:20 2020 -0700
Merge branch 'tb/bloom-improvements'
"git commit-graph write" learned to limit the number of bloom
filters that are computed from scratch with the --max-new-filters
option.
* tb/bloom-improvements:
commit-graph: introduce 'commitGraph.maxNewFilters'
builtin/commit-graph.c: introduce '--max-new-filters=<n>'
commit-graph: rename 'split_commit_graph_opts'
bloom: encode out-of-bounds filters as non-empty
bloom/diff: properly short-circuit on max_changes
bloom: use provided 'struct bloom_filter_settings'
bloom: split 'get_bloom_filter()' in two
commit-graph.c: store maximum changed paths
commit-graph: respect 'commitGraph.readChangedPaths'
t/helper/test-read-graph.c: prepare repo settings
commit-graph: pass a 'struct repository *' in more places
t4216: use an '&&'-chain
commit-graph: introduce 'get_bloom_filter_settings()'
commit c5a8f1efc03746fd6b6c71fef8e3a5c38ce4e2e8
Merge: 9bc233ae1c 087c61677c
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Sep 29 14:01:19 2020 -0700
Merge branch 'bc/faq-misc'
More FAQ entries.
* bc/faq-misc:
docs: explain how to deal with files that are always modified
docs: explain why reverts are not always applied on merge
docs: explain why squash merges are broken with long-running branches
commit d01141de5ab02cf4a156183ef4dc5ee8bf2638a3
Author: Sergey Organov <sorganov@gmail.com>
Date: Tue Sep 29 14:31:22 2020 +0300
diff: get rid of redundant 'dense' argument
Get rid of 'dense' argument that is redundant for every function that has
'struct rev_info *rev' argument as well, as the value of 'dense' passed is
always taken from 'rev->dense_combined_merges' field.
The only place where this was not the case is in 'submodule.c' where
'diff_tree_combined_merge()' was called with '1' for 'dense' argument. However,
at that call the 'revs' instance used is local to the function, and we now just
set 'revs->dense_combined_merges' to 1 in this local instance.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit bda959c4766d73ab435f26f2cc7c8c67b9443f5a
Author: Matheus Tavares <matheus.bernardino@usp.br>
Date: Mon Sep 28 21:01:53 2020 -0300
packfile: fix memory leak in add_delta_base_cache()
When add_delta_base_cache() is called with a base that is already in the
cache, no operation is performed. But the check is done after allocating
space for a new entry, so we end up leaking memory on the early return.
In addition, the caller never free()'s the base as it expects the
function to take ownership of it. But the base is not released when we
skip insertion, so it also gets leaked. To fix these problems, move the
allocation of a new entry further down in add_delta_base_cache(), and
free() the base on early return.
Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 74b052f8c269ef0b6f61a5ecf04a8568399345d9
Author: Matheus Tavares <matheus.bernardino@usp.br>
Date: Mon Sep 28 21:01:52 2020 -0300
packfile: fix race condition on unpack_entry()
The third phase of unpack_entry() performs the following sequence in a
loop, until all the deltas enumerated in phase one are applied and the
entry is fully reconstructed:
1. Add the current base entry to the delta base cache
2. Unpack the next delta
3. Patch the unpacked delta on top of the base
When the optional object reading lock is enabled, the above steps will
be performed while holding the lock. However, step 2. momentarily
releases it so that inflation can be performed in parallel for increased
performance. Because the `base` buffer inserted in the cache at 1. is
not duplicated, another thread can potentially free() it while the lock
is released at 2. (e.g. when there is no space left in the cache to
insert another entry). In this case, the later attempt to dereference
`base` at 3. will cause a segmentation fault. This problem was observed
during a multithreaded git-grep execution on a repository with large
objects.
To fix the race condition (and later segmentation fault), let's reorder
the aforementioned steps so that `base` is only added to the cache at
the end. This will prevent the buffer from being released by another
thread while it is still in use. An alternative solution which would not
require the reordering would be to duplicate `base` before inserting it
in the cache. However, as Phil Hord mentioned, memcpy()'ing large bases
can negatively affect performance: in his experiments, this alternative
approach slowed git-grep down by 10% to 20%.
Reported-by: Phil Hord <phil.hord@gmail.com>
Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 23547c40518ac04a20acf2f688114f5d97b61f24
Author: Jonathan Tan <jonathantanmy@google.com>
Date: Mon Sep 28 15:26:38 2020 -0700
fetch: do not override partial clone filter
When a fetch with the --filter argument is made, the configured default
filter is set even if one already exists. This change was made in
5e46139376 ("builtin/fetch: remove unique promisor remote limitation",
2019-06-25) - in particular, changing from:
* If this is the FIRST partial-fetch request, we enable partial
* on this repo and remember the given filter-spec as the default
* for subsequent fetches to this remote.
to:
* If this is a partial-fetch request, we enable partial on
* this repo if not already enabled and remember the given
* filter-spec as the default for subsequent fetches to this
* remote.
(The given filter-spec is "remembered" even if there is already an
existing one.)
This is problematic whenever a lazy fetch is made, because lazy fetches
are made using "git fetch --filter=blob:none", but this will also happen
if the user invokes "git fetch --filter=<filter>" manually. Therefore,
restore the behavior prior to 5e46139376, which writes a filter-spec
only if the current fetch request is the first partial-fetch one (for
that remote).
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 287416dba6258ab1819060fb62bb5df5d25aa10e
Author: Evan Gates <evan.gates@gmail.com>
Date: Mon Sep 28 15:51:08 2020 -0700
Doc: show example scissors line
The text tries to say the code accepts many variations that look remotely
like scissors and perforation marks, but gives too little detail for users
to decide what is and what is not taken as a scissors line for themselves.
Instead of describing the heuristics more, just spell out what will always
be accepted, namely "-- >8 --", as it would not help users to give them
more choices and flexibility and be "creative" in their scissors line.
Signed-off-by: Evan Gates <evan.gates@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit e18ae4e7a6cd687ba9dac8be1e88a3d99f676fd5
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon Sep 28 21:09:08 2020 +0000
cmake: ensure that the `vcpkg` packages are found on Windows
On Windows, we use the `vcpkg` project to manage the dependencies, via
`compat/vcbuild/`. Let's make sure that these dependencies are found by
default.
This is needed because we are about to recommend loading the Git
worktree as a folder into Visual Studio, relying on the automatic CMake
support (which would make it relatively cumbersome to adjust the search
path used by CMake manually).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 72b6eeb81b163d3b9e4e9546f8041160b2d759c9
Author: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon Sep 28 21:09:07 2020 +0000
cmake: do find Git for Windows' shell interpreter
By default, Git for Windows does not install its `sh.exe` into the
`PATH`. However, our current `CMakeLists.txt` expects to find a shell
interpreter in the `PATH`.
So let's fall back to looking in the default location where Git for
Windows _does_ install a relatively convenient `sh.exe`:
`C:\Program Files\Git\bin\sh.exe`
Helped-by: Øystein Walle <oystwa@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 71ccaa0993b3430e8c10352ea8f09547b6173b8d
Author: Martin Ågren <martin.agren@gmail.com>
Date: Sun Sep 27 16:11:55 2020 +0200
config/uploadpack.txt: fix typo in `--filter=tree:<n>`
That should be a ":", not a second "=". While at it, refer to the
placeholder "<n>" as "<n>", not "n" (see, e.g., the entry just before
this one).
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 10a758479ee6003862ca65a230cf1e992c9e12d8
Author: Martin Ågren <martin.agren@gmail.com>
Date: Sun Sep 27 16:00:45 2020 +0200
config/fmt-merge-msg.txt: drop space in quote
We document how `merge.suppressDest` can be used to omit " into <branch
name>" from the title of the merge message. It is true that we omit the
space character before "into", but that lone double quote character
risks ending up on the wrong side of a line break, looking a bit out of
place. This currently happens with, e.g., 80-character terminals.
Drop that leading quoted space. The result should be just as clear about
how this option affects the formatted message.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit a46d1f732192a8621ead7ea5c4a3ca391ad881cb
Author: Martin Ågren <martin.agren@gmail.com>
Date: Sun Sep 27 15:15:47 2020 +0200
worktree: use skip_prefix to parse target
Instead of checking for "refs/heads/" using `starts_with()`, then
skipping past "refs/heads/" using `strlen()`, just use `skip_prefix()`.
In `is_worktree_being_rebased()`, we can adjust the indentation while
we're here and lose a pair of parentheses which isn't needed and which
might even make the reader wonder what they're missing and why that
grouping is there.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit fb07bd42975bcbfbc29d4a3ef1bff1039a469336
Author: Martin Ågren <martin.agren@gmail.com>
Date: Sun Sep 27 15:15:46 2020 +0200
worktree: rename copy-pasted variable
As the commit message of 04a3dfb8b5 ("worktree.c: check whether branch
is bisected in another worktree", 2016-04-22) indicates, the function
`is_worktree_being_bisected()` is based on the older function
`is_worktree_being_rebased()`. This heritage can also be seen in the
name of the variable where we store our return value: It was never
adapted while copy-editing and remains as `found_rebase`.
Rename the variable to make clear that we're looking for a bisect(ion),
nothing else.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit cfaf9f05c6174b520082036c0f1439adf9c4fbf7
Author: Martin Ågren <martin.agren@gmail.com>
Date: Sun Sep 27 15:15:45 2020 +0200
worktree: update renamed variable in comment
The comment above `add_head_info()` mentions "head_sha1", but it was
renamed to "head_oid" in 0f05154c70 ("worktree: convert struct worktree
to object_id", 2017-10-15). Update the comment.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit ef2d5547fa342197befd4be599438d7a7fa41e04
Author: Martin Ågren <martin.agren@gmail.com>
Date: Sun Sep 27 15:15:44 2020 +0200
worktree: inline `worktree_ref()` into its only caller
We have `strbuf_worktree_ref()`, which works on a strbuf, and a wrapper
for it, `worktree_ref()` which returns a string. We even make this
wrapper available through worktree.h. But it only has a single caller,
sitting right next to it in worktree.c.
Just inline the wrapper into its only caller. This means the caller can
quite naturally reuse a single strbuf. We currently achieve something
similar by having a static strbuf in the wrapper.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 962dd7ebc3e76afc2c896d377c319f8140966303
Author: Martin Ågren <martin.agren@gmail.com>
Date: Sun Sep 27 15:15:43 2020 +0200
wt-status: introduce wt_status_state_free_buffers()
When we have a `struct wt_status_state`, we manually free its `branch`,
`onto` and `detached_from`, or sometimes just one or two of them.
Provide a function `wt_status_state_free_buffers()` which does the
freeing.
The callers are still aware of these fields, e.g., they check whether
`branch` was populated or not. But this way, they don't need to know
about *all* of them, and if `struct wt_status_state` gets more fields,
they will not need to learn to free them.
Users of `struct wt_status` (which contains a `wt_status_state`) already
have `wt_status_collect_free_buffers()` (corresponding to
`wt_status_collect()`) which we can also teach to use this new helper.
Finally, note that we're currently leaving dangling pointers behind.
Some callers work on a stack-allocated struct, where this is obviously
ok. But for the users of `run_status()` in builtin/commit.c, there are
ample opportunities for someone to mistakenly use those dangling
pointers. We seem to be ok for now, but it's a use-after-free waiting to
happen. Let's leave NULL-pointers behind instead.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 8f7e3de0970c419688f23f505b5cb7a9690d9b09
Author: Martin Ågren <martin.agren@gmail.com>
Date: Sun Sep 27 15:15:42 2020 +0200
wt-status: print to s->fp, not stdout
We pass around a `FILE *` in the `struct wt_status` and almost always
print to it. But in a few places, we write to `stdout` instead, either
explicitly through `fprintf(stdout, ...)` or implicitly with
`printf(...)` (and a few `putchar(...)`).
Always be explicit about writing to `s->fp`. To the best of my
understanding, this never mattered in practice because these spots are
involved in various forms of `git status` which always end up at
standard output anyway. When we do write to another file, it's because
we're creating a commit message template, and these code paths aren't
involved.
But let's be consistent to help future readers and avoid future bugs.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit b1f1ade87be595b5854c82850658c80465fdb16b
Author: Martin Ågren <martin.agren@gmail.com>
Date: Sun Sep 27 15:15:41 2020 +0200
wt-status: replace sha1 mentions with oid
`abbrev_sha1_in_line()` uses a `struct object_id oid` and should be
fully prepared to handle non-SHA1 object ids. Rename it to
`abbrev_oid_in_line()`.
A few comments in `wt_status_get_detached_from()` mention "sha1". The
variable they refer to was renamed in e86ab2c1cd ("wt-status: convert to
struct object_id", 2017-02-21). Update the comments to reference "oid"
instead.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 63d24fa0b055d3f0386ee3686c07428450add708
Author: Jeff King <peff@peff.net>
Date: Sun Sep 27 04:40:15 2020 -0400
shortlog: allow multiple groups to be specified
Now that shortlog supports reading from trailers, it can be useful to
combine counts from multiple trailers, or between trailers and authors.
This can be done manually by post-processing the output from multiple
runs, but it's non-trivial to make sure that each name/commit pair is
counted only once.
This patch teaches shortlog to accept multiple --group options on the
command line, and pull data from all of them. That makes it possible to
run:
git shortlog -ns --group=author --group=trailer:co-authored-by
to get a shortlog that counts authors and co-authors equally.
The implementation is mostly straightforward. The "group" enum becomes a
bitfield, and the trailer key becomes a list. I didn't bother
implementing the multi-group semantics for reading from stdin. It would
be possible to do, but the existing matching code makes it awkward, and
I doubt anybody cares.
The duplicate suppression we used for trailers now covers authors and
committers as well (though in non-trailer single-group mode we can skip
the hash insertion and lookup, since we only see one value per commit).
There is one subtlety: we now care about the case when no group bit is
set (in which case we default to showing the author). The caller in
builtin/log.c needs to be adapted to ask explicitly for authors, rather
than relying on shortlog_init(). It would be possible with some
gymnastics to make this keep working as-is, but it's not worth it for a
single caller.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 56d5dde7526e725a9e590f32fe38ce6b3391bc36
Author: Jeff King <peff@peff.net>
Date: Sun Sep 27 04:40:11 2020 -0400
shortlog: parse trailer idents
Trailers don't necessarily contain name/email identity values, so
shortlog has so far treated them as opaque strings. However, since many
trailers do contain identities, it's useful to treat them as such when
they can be parsed. That lets "-e" work as usual, as well as mailmap.
When they can't be parsed, we'll continue with the old behavior of
treating them as a single string (there's no new test for that here,
since the existing tests cover a trailer like this).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 87abb96222b076a1a9aa9c92f799107141feeca4
Author: Jeff King <peff@peff.net>
Date: Sun Sep 27 04:40:09 2020 -0400
shortlog: rename parse_stdin_ident()
This function is actually useful for parsing any identity, whether from
stdin or not. We'll need it for handling trailers.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit f17b0b99bf2dc2fcd74544ce35d058e558e6b056
Author: Jeff King <peff@peff.net>
Date: Sun Sep 27 04:40:07 2020 -0400
shortlog: de-duplicate trailer values
The current documentation is vague about what happens with
--group=trailer:signed-off-by when we see a commit with:
Signed-off-by: One
Signed-off-by: Two
Signed-off-by: One
We clearly should credit both "One" and "Two", but should "One" get
credited twice? The current code does so, but mostly because that was
the easiest thing to do. It's probably more useful to count each commit
at most once. This will become especially important when we allow
values from multiple sources in a future patch.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
![[bug history graph]](https://qa.debian.org/data/bts/graphs/g/git.png){kind=link}