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 79e6649b6b538e376d053623713bc4a790991f39
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed Apr 10 08:04:47 2019 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit d388614a4b9a1b286364d54fc5075c54b25bac41
Merge: b12457ad3 511ec345e
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed Apr 10 08:02:13 2019 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
commit 511ec345e18b91bfc070cff61e34b433cb3e5a41
Merge: 787b1b507 e35b8cb8e
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:39 2019 +0900
Sync with master
commit 787b1b5073be73d4219df428451bb44bca3de528
Merge: 86ca3ebf3 0b918b75a
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:27 2019 +0900
Merge branch 'sg/t5318-cleanup' into next
Code cleanup.
* sg/t5318-cleanup:
t5318-commit-graph: remove unused variable
commit 86ca3ebf33ba3d915edb3de587134f8c25dd5885
Merge: d49336dd3 3a9e1ad78
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:27 2019 +0900
Merge branch 'jt/t5551-protocol-v2-does-not-have-half-auth' into next
Test update.
* jt/t5551-protocol-v2-does-not-have-half-auth:
t5551: mark half-auth no-op fetch test as v0-only
commit d49336dd3b6f4955b2e35b1c758ec48dff4d8dc8
Merge: 2ac6c933d 3d10f72ef
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:26 2019 +0900
Merge branch 'jk/http-walker-status-fix' into next
dumb-http walker has been updated to share more error recovery
strategy with the normal codepath.
* jk/http-walker-status-fix:
http: use normalize_curl_result() instead of manual conversion
http: normalize curl results for dumb loose and alternates fetches
http: factor out curl result code normalization
commit 2ac6c933d4f75ce70493e0300890948a4015ef56
Merge: b0dfa1001 5ae18df9d
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:26 2019 +0900
Merge branch 'jh/midx-verify-too-many-packs' into next
"git multi-pack-index verify" did not scale well with the number of
packfiles, which is being improved.
* jh/midx-verify-too-many-packs:
midx: during verify group objects by packfile to speed verification
midx: add progress indicators in multi-pack-index verify
trace2:data: add trace2 data to midx
progress: add sparse mode to force 100% complete message
commit b0dfa1001e2f919604e75332fc5a66bc86a0884d
Merge: e160d4a5b 584b62c37
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:26 2019 +0900
Merge branch 'bb/unicode-12' into next
Unicode update.
* bb/unicode-12:
unicode: update the width tables to Unicode 12
commit e160d4a5b0c6fa89609a98d3a8a0e8cf79279c42
Merge: 893b135f1 d3322eb28
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:25 2019 +0900
Merge branch 'jk/refs-double-abort' into next
A corner case bug in the refs API has been corrected.
* jk/refs-double-abort:
refs/files-backend: don't look at an aborted transaction
refs/files-backend: handle packed transaction prepare failure
commit 893b135f106caaf66ece8fae53fd2eb4cf52eca4
Merge: cdda4e833 cdb5330a9
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:25 2019 +0900
Merge branch 'nd/diff-parseopt-4' into next
Fourth batch to teach the diff machinery to use the parse-options
API.
* nd/diff-parseopt-4:
am: avoid diff_opt_parse()
diff --no-index: use parse_options() instead of diff_opt_parse()
range-diff: use parse_options() instead of diff_opt_parse()
diff.c: allow --no-color-moved-ws
diff-parseopt: convert --color-moved-ws
diff-parseopt: convert --[no-]color-moved
diff-parseopt: convert --inter-hunk-context
diff-parseopt: convert --no-prefix
diff-parseopt: convert --line-prefix
diff-parseopt: convert --[src|dst]-prefix
diff-parseopt: convert --[no-]abbrev
diff-parseopt: convert --diff-filter
diff-parseopt: convert --find-object
diff-parseopt: convert -O
diff-parseopt: convert --pickaxe-all|--pickaxe-regex
diff-parseopt: convert -S|-G
diff-parseopt: convert -l
diff-parseopt: convert -z
diff-parseopt: convert --ita-[in]visible-in-index
diff-parseopt: convert --ws-error-highlight
commit cdda4e833e7959efcc67cf55db741a9d531281a4
Merge: 12edf8872 a7256debd
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:24 2019 +0900
Merge branch 'nd/checkout-m-doc-update' into next
Doc about the above.
* nd/checkout-m-doc-update:
checkout.txt: note about losing staged changes with --merge
commit 12edf8872fe92504280abecda848beeb7c336dfd
Merge: 9489a31a3 95be717cd
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:24 2019 +0900
Merge branch 'jk/unused-params-even-more' into next
Code cleanup
* jk/unused-params-even-more:
parse_opt_ref_sorting: always use with NONEG flag
pretty: drop unused strbuf from parse_padding_placeholder()
pretty: drop unused "type" parameter in needs_rfc2047_encoding()
parse-options: drop unused ctx parameter from show_gitcomp()
fetch_pack(): drop unused parameters
report_path_error(): drop unused prefix parameter
unpack-trees: drop unused error_type parameters
unpack-trees: drop name_entry from traverse_by_cache_tree()
test-date: drop unused "now" parameter from parse_dates()
update-index: drop unused prefix_length parameter from do_reupdate()
log: drop unused "len" from show_tagger()
log: drop unused rev_info from early output
revision: drop some unused "revs" parameters
commit 9489a31a3691de9f4ac130d2db793e27fe248df5
Merge: 94fe0f66d 8e407bc81
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:23 2019 +0900
Merge branch 'tg/stash-in-c-show-default-to-p-fix' into next
A regression fix.
* tg/stash-in-c-show-default-to-p-fix:
stash: setup default diff output format if necessary
commit 94fe0f66d8638d971fda113d2b9e4e2a91e92e11
Merge: a26ec8420 ad006fe41
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:23 2019 +0900
Merge branch 'tb/trace2-va-list-fix' into next
Fix some code that passed a NULL when a va_list was expected.
* tb/trace2-va-list-fix:
trace2: NULL is not allowed for va_list
commit a26ec8420feca02d91f337f1ee1f40fe56d21ccb
Merge: af08a97ab 2eb6f09f7
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:23 2019 +0900
Merge branch 'tz/completion' into next
The completion helper code now pays attention to repository-local
configuration (when available), which allows --list-cmds to honour
a repository specific setting of completion.commands, for example.
* tz/completion:
completion: use __git when calling --list-cmds
completion: fix multiple command removals
t9902: test multiple removals via completion.commands
git: read local config in --list-cmds
commit af08a97ab95207dffc9ee6f989aff151c847bcbe
Merge: 9845123f1 e60507726
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:22 2019 +0900
Merge branch 'ma/doc-diff-doc-vs-doctor-comparison' into next
Dev support update to make it easier to compare two formatted
results from our documentation.
* ma/doc-diff-doc-vs-doctor-comparison:
doc-diff: add `--cut-header-footer`
doc-diff: support diffing from/to AsciiDoc(tor)
doc-diff: let `render_tree()` take an explicit directory name
Doc: auto-detect changed build flags
commit 9845123f19f725dbb8834c7a32fef1d859bf5666
Merge: ff8abf36a 7951a016a
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:22 2019 +0900
Merge branch 'tz/t4038-bash-redirect-target-workaround' into next
Work-around extra warning from bash in our tests.
* tz/t4038-bash-redirect-target-workaround:
t4038-diff-combined: quote paths with whitespace
commit ff8abf36ae83c9428603affe6bbd550db677af0e
Merge: de1832713 d03ebd411
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:22 2019 +0900
Merge branch 'ab/drop-scripted-rebase' into next
Retire scripted "git rebase" implementation.
* ab/drop-scripted-rebase:
rebase: remove the rebase.useBuiltin setting
commit de18327138a648d947861232358df8cc6fe14bda
Merge: 06d19acd7 0baf78e7b
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:22 2019 +0900
Merge branch 'jk/perf-lib-tee' into next
Code cleanup in the test framework.
* jk/perf-lib-tee:
perf-lib.sh: rely on test-lib.sh for --tee handling
commit 06d19acd7e274805ebe7f5a81ba25b3954c44866
Merge: 037673d71 ed31851fa
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:21 2019 +0900
Merge branch 'ab/doc-misc-typofixes' into next
Typofixes.
* ab/doc-misc-typofixes:
doc: fix typos in man pages
commit 037673d71c265c38b34a7f166d874250ef9e9405
Merge: f5415c65c 74cc547b0
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:21 2019 +0900
Merge branch 'mh/pack-protocol-doc-fix' into next
Docfix.
* mh/pack-protocol-doc-fix:
fix pack protocol example client/server communication
commit f5415c65cc9201e845ce2f5026d5fd50c3f12809
Merge: 1afc97743 7aba81407
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:21 2019 +0900
Merge branch 'tg/glossary-overlay' into next
Doc update.
* tg/glossary-overlay:
glossary: add definition for overlay
commit 1afc9774354d01207528c33e264ec978e8da3a02
Merge: 783913529 ab5af825d
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:20 2019 +0900
Merge branch 'nd/checkout-f-while-conflicted-fix' into next
"git checkout -f <branch>" while the index has an unmerged path
incorrectly left some paths in an unmerged state, which has been
corrected.
* nd/checkout-f-while-conflicted-fix:
unpack-trees: fix oneway_merge accidentally carry over stage index
commit 7839135291481b31ff478f1cf52947b3c8a4999d
Merge: cf79e8668 74ec8cf67
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:20 2019 +0900
Merge branch 'sg/test-atexit' into next
Test framework update to more robustly clean up leftover files and
processes after tests are done.
* sg/test-atexit:
t9811-git-p4-label-import: fix pipeline negation
git p4 test: disable '-x' tracing in the p4d watchdog loop
git p4 test: simplify timeout handling
git p4 test: clean up the p4d cleanup functions
git p4 test: use 'test_atexit' to kill p4d and the watchdog process
t0301-credential-cache: use 'test_atexit' to stop the credentials helper
tests: use 'test_atexit' to stop httpd
git-daemon: use 'test_atexit` to stop 'git-daemon'
test-lib: introduce 'test_atexit'
t/lib-git-daemon: make sure to kill the 'git-daemon' process
test-lib: fix interrupt handling with 'dash' and '--verbose-log -x'
commit cf79e86682fb68eb550a80017267227146551bcb
Merge: 7eab7c780 15c6dbd87
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:19 2019 +0900
Merge branch 'pw/rerere-autoupdate' into next
Doc updates.
* pw/rerere-autoupdate:
merge: tweak --rerere-autoupdate documentation
am/cherry-pick/rebase/revert: document --rerere-autoupdate
commit 7eab7c7800f24b365e8f6cd505aa1969771c1450
Merge: 6ca358b7e ed35d1884
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:19 2019 +0900
Merge branch 'ag/sequencer-reduce-rewriting-todo' into next
The scripted version of "git rebase -i" wrote and rewrote the todo
list many times during a single step of its operation, and the
recent C-rewrite made a faithful conversion of the logic to C. The
implementation has been updated to carry necessary information
around in-core to avoid rewriting the same file over and over
unnecessarily.
* ag/sequencer-reduce-rewriting-todo:
rebase--interactive: move transform_todo_file()
sequencer: use edit_todo_list() in complete_action()
rebase-interactive: rewrite edit_todo_list() to handle the initial edit
rebase-interactive: append_todo_help() changes
rebase-interactive: use todo_list_write_to_file() in edit_todo_list()
sequencer: refactor skip_unnecessary_picks() to work on a todo_list
rebase--interactive: move rearrange_squash_in_todo_file()
rebase--interactive: move sequencer_add_exec_commands()
sequencer: change complete_action() to use the refactored functions
sequencer: make sequencer_make_script() write its script to a strbuf
sequencer: refactor rearrange_squash() to work on a todo_list
sequencer: refactor sequencer_add_exec_commands() to work on a todo_list
sequencer: refactor check_todo_list() to work on a todo_list
sequencer: introduce todo_list_write_to_file()
sequencer: refactor transform_todos() to work on a todo_list
sequencer: remove the 'arg' field from todo_item
sequencer: make the todo_list structure public
sequencer: changes in parse_insn_buffer()
commit 6ca358b7ef709b13ba41eaa6028563b8fc52bd49
Merge: 5c77e3972 2fe95f494
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:19 2019 +0900
Merge branch 'jc/format-patch-error-check' into next
"git format-patch" used overwrite an existing patch/cover-letter
file. A new "--no-clobber" option stops it.
* jc/format-patch-error-check:
format-patch: notice failure to open cover letter for writing
builtin/log: downcase the beginning of error messages
commit 5c77e39722a38f3bb2766c10c7c68d416879e420
Merge: 8631f869c 6d67a993b
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:18 2019 +0900
Merge branch 'js/get-short-oid-drop-cache' into next
A corner-case object name ambiguity while the sequencer machinery
is working (e.g. "rebase -i -x") has been (half) fixed.
* js/get-short-oid-drop-cache:
get_oid(): when an object was not found, try harder
sequencer: move stale comment into correct location
sequencer: improve error message when an OID could not be parsed
rebase -i: demonstrate obscure loose object cache bug
commit 8631f869c52235ecc02b6a2f9fd0b30b5487d247
Merge: 1d5768849 77128ed90
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:18 2019 +0900
Merge branch 'dl/subtree-limit-to-one-rev' into next
"git subtree" (in contrib/) update.
* dl/subtree-limit-to-one-rev:
contrib/subtree: ensure only one rev is provided
commit 1d5768849fd82b9b1178e507316df7cc1f8d9766
Merge: 4814acf6c 287853392
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:17 2019 +0900
Merge branch 'js/init-db-update-for-mingw' into next
"git init" forgot to read platform-specific repository
configuration, which made Windows port to ignore settings of
core.hidedotfiles, for example.
* js/init-db-update-for-mingw:
mingw: respect core.hidedotfiles = false in git-init again
commit 4814acf6c89928552dfdbbcfa70caeacb3b95fce
Merge: 137a19102 ed8b4132c
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:17 2019 +0900
Merge branch 'js/remote-curl-i18n' into next
Error messages given from the http transport have been updated so
that they can be localized.
* js/remote-curl-i18n:
remote-curl: mark all error messages for translation
commit 137a1910214f6b8cdc40057fb544a7ab52c20bd8
Merge: 77cf886e7 c1284b21f
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:16 2019 +0900
Merge branch 'js/anonymize-remote-curl-diag' into next
remote-http transport did not anonymize URLs reported in its error
messages at places.
* js/anonymize-remote-curl-diag:
curl: anonymize URLs in error messages and warnings
commit 77cf886e7ea3e548c470ebd8f29a6ee5b927bf9c
Merge: 41a7f5100 8d75a1d18
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:16 2019 +0900
Merge branch 'ma/asciidoctor-fixes-more' into next
Documentation mark-up fixes.
* ma/asciidoctor-fixes-more:
Documentation: turn middle-of-line tabs into spaces
git-svn.txt: drop escaping '\' that ends up being rendered
git.txt: remove empty line before list continuation
config/fsck.txt: avoid starting line with dash
config/diff.txt: drop spurious backtick
commit 41a7f51003dc86021f5b4dcde7684363d3846ade
Merge: f8f678715 185f9a0ea
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:40:15 2019 +0900
Merge branch 'ma/asciidoctor-fixes' into next
Build fix around use of asciidoctor instead of asciidoc
* ma/asciidoctor-fixes:
asciidoctor-extensions: fix spurious space after linkgit
Documentation/Makefile: add missing dependency on asciidoctor-extensions
Documentation/Makefile: add missing xsl dependencies for manpages
commit e35b8cb8e212e3557efc565157ceb5cbaaf0d87f
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:19:09 2019 +0900
The fourth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 32414ceb854de44a9b4b74c975ae410713a17c99
Merge: c063a537b bd5e567dc
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:14:26 2019 +0900
Merge branch 'jt/submodule-fetch-errmsg'
Error message update.
* jt/submodule-fetch-errmsg:
submodule: explain first attempt failure clearly
commit c063a537bedd3b2363494171de2bbd58bf5c66a9
Merge: 2d3372883 07a20f569
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:14:26 2019 +0900
Merge branch 'jk/sha1dc'
Build update for SHA-1 with collision detection.
* jk/sha1dc:
Makefile: fix unaligned loads in sha1dc with UBSan
commit 2d3372883f133ef64d3eb678e8e6bfc6ffc6169a
Merge: 7caf4cfb8 c3a7dd70c
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:14:25 2019 +0900
Merge branch 'jk/promote-ggg'
Suggest GitGitGadget instead of submitGit as a way to submit
patches based on GitHub PR to us.
* jk/promote-ggg:
point pull requesters to GitGitGadget
commit 7caf4cfb81d3e728f0b340e09faa13745b903b68
Merge: fa1b86e45 e041d0781
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:14:25 2019 +0900
Merge branch 'ar/t4150-remove-cruft'
Test cleanup.
* ar/t4150-remove-cruft:
t4150: remove unused variable
commit fa1b86e45743fd5895c33adcd3769782e608bb40
Merge: 20fe798b1 427c3bd28
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:14:24 2019 +0900
Merge branch 'js/rebase-deprecate-preserve-merges'
"git rebase --rebase-merges" replaces its old "--preserve-merges"
option; the latter is now marked as deprecated.
* js/rebase-deprecate-preserve-merges:
rebase: deprecate --preserve-merges
commit 20fe798b1bf301f78485a56381ad8dad48b2c670
Merge: 31df2c101 7af01f236
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:14:24 2019 +0900
Merge branch 'ms/worktree-add-atomic-mkdir'
"git worktree add" used to do a "find an available name with stat
and then mkdir", which is race-prone. This has been fixed by using
mkdir and reacting to EEXIST in a loop.
* ms/worktree-add-atomic-mkdir:
worktree: fix worktree add race
commit 31df2c1019733ac22fc848aa2658a0e25af70a79
Merge: ac9e40e8e 05314efae
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:14:23 2019 +0900
Merge branch 'jk/line-log-with-patch'
"git log -L<from>,<to>:<path>" with "-s" did not suppress the patch
output as it should. This has been corrected.
* jk/line-log-with-patch:
line-log: detect unsupported formats
line-log: suppress diff output with "-s"
commit ac9e40e8ef796e43ae4438cbcd923bfa1056be61
Merge: 917f2cd1c 59a06e947
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:14:23 2019 +0900
Merge branch 'ra/t3600-test-path-funcs'
A GSoC micro.
* ra/t3600-test-path-funcs:
t3600: use helpers to replace test -d/f/e/s <path>
t3600: modernize style
test functions: add function `test_file_not_empty`
commit 917f2cd1c2396c694ae956a1a26d9c92bf50b847
Merge: 1828e52ef b9317d55a
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:14:23 2019 +0900
Merge branch 'nd/rewritten-ref-is-per-worktree'
"git rebase" uses the refs/rewritten/ hierarchy to store its
intermediate states, which inherently makes the hierarchy per
worktree, but it didn't quite work well.
* nd/rewritten-ref-is-per-worktree:
Make sure refs/rewritten/ is per-worktree
files-backend.c: reduce duplication in add_per_worktree_entries_to_dir()
files-backend.c: factor out per-worktree code in loose_fill_ref_dir()
commit 1828e52efcffe75707b88345f025c3ee4114864a
Merge: b582c1681 02156ab03
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:14:22 2019 +0900
Merge branch 'jh/resize-convert-scratch-buffer'
When the "clean" filter can reduce the size of a huge file in the
working tree down to a small "token" (a la Git LFS), there is no
point in allocating a huge scratch area upfront, but the buffer is
sized based on the original file size. The convert mechanism now
allocates very minimum and reallocates as it receives the output
from the clean filter process.
* jh/resize-convert-scratch-buffer:
convert: avoid malloc of original file size
commit b582c1681ed9579ced82b72f26119cec0859e64c
Merge: 081b08c45 af91b0230
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:14:22 2019 +0900
Merge branch 'dl/ignore-docs'
Doc update.
* dl/ignore-docs:
docs: move core.excludesFile from git-add to gitignore
git-clean.txt: clarify ignore pattern files
commit 081b08c45c88d21d869adea50cff9d83544418cf
Merge: 0b2094b06 64eca306a
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:14:21 2019 +0900
Merge branch 'ja/dir-rename-doc-markup-fix'
Doc update.
* ja/dir-rename-doc-markup-fix:
Doc: fix misleading asciidoc formating
commit 0b2094b06b8e810ba21348179cb71122faeb9263
Merge: 041f5ea1c 56cb2d30f
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Apr 10 02:14:20 2019 +0900
Merge branch 'dl/reset-doc-no-wrt-abbrev'
Doc update.
* dl/reset-doc-no-wrt-abbrev:
git-reset.txt: clarify documentation
commit cdb5330a9baa64c28473fb0f446ca2242d6971fb
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun Mar 24 15:20:14 2019 +0700
am: avoid diff_opt_parse()
diff_opt_parse() is a heavy hammer to just set diff filter. But it's
the only way because of the diff_status_letters[] mapping. Add a new
API to set diff filter and use it in git-am. diff_opt_parse()'s only
remaining call site in revision.c will be gone soon and having it here
just because of git-am does not make sense.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 16bb3d714dcb1bf50f7f96b957c4306dc6df137e
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun Mar 24 15:20:13 2019 +0700
diff --no-index: use parse_options() instead of diff_opt_parse()
While at there, move exit() back to the caller. It's easier to see the
flow that way than burying it in diff-no-index.c
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit c380a48c8b40331dd6466d6b565af6d44c7b11bf
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun Mar 24 15:20:12 2019 +0700
range-diff: use parse_options() instead of diff_opt_parse()
Diff's internal option parsing is now done with 'struct option', which
makes it possible to combine all diff options to range-diff and parse
everything all at once. Parsing code becomes simpler, and we get a
looong 'git range-diff -h'
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit bb9872904e032f28e4ac9d2438c4daba9eae9d05
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun Mar 24 15:20:11 2019 +0700
diff.c: allow --no-color-moved-ws
This option is added in commit b73bcbac4a (diff: allow
--no-color-moved-ws - 2018-11-23) in pw/diff-color-moved-ws-fix. To ease
merge conflict resolution, re-implement the option handling here so that
the conflict could be resolved by taking this side of change.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 8ce2020ff079955b4a068d96a93e00a65f570355
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun Mar 24 15:20:10 2019 +0700
diff-parseopt: convert --color-moved-ws
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 59311a9820df1c5f3463d1447458692fdbfef606
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun Mar 24 15:20:09 2019 +0700
diff-parseopt: convert --[no-]color-moved
Mark one more string for translation while at there
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 16ed6c97cc6cc3de2637e9df8bb057e1254667c9
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun Mar 24 15:20:08 2019 +0700
diff-parseopt: convert --inter-hunk-context
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 11c659d89089ca236c65a1b824e85a27d9f09bcd
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun Mar 24 15:20:07 2019 +0700
diff-parseopt: convert --no-prefix
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 2f81cf9895fedb864477f9fb318c9ec7dc0a17ab
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun Mar 24 15:20:06 2019 +0700
diff-parseopt: convert --line-prefix
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 31fba9d3b4d37518be3261af430f81af375de16e
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun Mar 24 15:20:05 2019 +0700
diff-parseopt: convert --[src|dst]-prefix
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit d877418390168c9696fd46d5e78ca3362f26f74c
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun Mar 24 15:20:04 2019 +0700
diff-parseopt: convert --[no-]abbrev
OPT__ABBREV() has the same behavior as the deleted code with one
difference: it does check for valid number and error out if not. And the
'40' change is self explanatory.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit d2d3f27300967e76e0c9f3a916e7e236ff95f1aa
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun Mar 24 15:20:03 2019 +0700
diff-parseopt: convert --diff-filter
While at it, mark one more string for translation
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit a75f28cbda5ec4b478287f452d77ef7137ef50fa
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun Mar 24 15:20:02 2019 +0700
diff-parseopt: convert --find-object
While at it, mark one more string for translation.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit f731814b3a5eec699b73bbb72ff07de66aea100d
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun Mar 24 15:20:01 2019 +0700
diff-parseopt: convert -O
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 85f8e889ea3b1eeb0d183c6db8c4a407a8133350
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun Mar 24 15:20:00 2019 +0700
diff-parseopt: convert --pickaxe-all|--pickaxe-regex
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit a41cfb3203843fe47d902622dcf33db2209a0d1c
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun Mar 24 15:19:59 2019 +0700
diff-parseopt: convert -S|-G
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit bffee749a8d749913bae24e8b6ae17c8cf846770
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun Mar 24 15:19:58 2019 +0700
diff-parseopt: convert -l
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 1a1eb164cfec50ab9869cd3e61f2415ae9e2f599
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun Mar 24 15:19:57 2019 +0700
diff-parseopt: convert -z
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 96860e48d3b7da2f20f4b7e8668246335d0527b9
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun Mar 24 15:19:56 2019 +0700
diff-parseopt: convert --ita-[in]visible-in-index
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 5a749d9f97c680c7379cadda474396e7c4301254
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun Mar 24 15:19:55 2019 +0700
diff-parseopt: convert --ws-error-highlight
Mark one more string for translation while at there.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 0b918b75af41667074b4348afb58190448984314
Author: SZEDER Gábor <szeder.dev@gmail.com>
Date: Fri Mar 22 15:27:25 2019 +0100
t5318-commit-graph: remove unused variable
This is a remnant from early versions of the commit-graph patch series
[1], when 'git commit-graph --write' printed the hash of the created
commit-graph file, and tests did look at the command's output, because
the commit-graph file's name included that hash as well.
[1] https://public-inbox.org/git/1517348383-112294-6-git-send-email-dstolee@microsoft.com/
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 3a9e1ad78d97e008aaaf7e3cc0eaa231a742931c
Author: Jonathan Tan <jonathantanmy@google.com>
Date: Fri Mar 22 12:01:39 2019 -0700
t5551: mark half-auth no-op fetch test as v0-only
When using protocol v0, upload-pack over HTTP permits a "half-auth"
configuration in which, at the web server layer, the info/refs path is
not protected by authentication but the git-upload-pack path is, so that
a user can perform fetches that do not download any objects without
authentication, but still needs authentication to download objects.
But protocol v2 does not support this, because both ref and pack are
obtained from the git-upload-pack path.
Mark the test verifying this behavior as protocol v0-only, with a
description of what needs to be done to make v2 support this.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 3d10f72ef8eaa229b285d39b4848aac41e5a8b02
Author: Jeff King <peff@peff.net>
Date: Sun Mar 24 08:13:16 2019 -0400
http: use normalize_curl_result() instead of manual conversion
When we switched off CURLOPT_FAILONERROR in 17966c0a63 (http: avoid
disconnecting on 404s for loose objects, 2016-07-11), the fetch_object()
function started manually handling 404's. Since we now have
normalize_curl_result() for use elsewhere, we can use it here as well,
shortening the code.
Note that we lose the check for http/https in the URL here. None of the
other result-normalizing code paths bother with this. Looking at
missing_target(), which checks specifically for an FTP-specific CURLcode
and "http" code 550, it seems likely that git-over-ftp has been subtly
broken since 17966c0a63. This patch does nothing to fix that, but nor
should it make anything worse (in fact, it may be slightly better
because we'll actually recognize an error as such, rather than assuming
CURLE_OK means we actually got some data).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit ccbbd8bf66ca88385a34b16abcc1d5a800650d3a
Author: Jeff King <peff@peff.net>
Date: Sun Mar 24 08:09:46 2019 -0400
http: normalize curl results for dumb loose and alternates fetches
If the dumb-http walker encounters a 404 when fetching a loose object,
it then looks at any http-alternates for the object. The 404 check is
implemented by missing_target(), which checks not only the http code,
but also that we got an http error from the CURLcode.
That broke when we stopped using CURLOPT_FAILONERROR in 17966c0a63
(http: avoid disconnecting on 404s for loose objects, 2016-07-11), since
our CURLcode will now be CURLE_OK. As a result, fetching over dumb-http
from a repository with alternates could result in Git printing "Unable
to find abcd1234..." and aborting.
We could probably fix this just by loosening missing_target(). However,
there's other code which looks at the curl result, and it would have to
be tweaked as well. Instead, let's just normalize the result the same
way the smart-http code does.
There's a similar case in processing the alternates (where we failover
from "info/http-alternates" to "info/alternates"). We'll give it the
same treatment.
After this patch, we should be hitting all code paths that need this
normalization (notably absent here is the http_pack_request path, but it
does not use FAILONERROR, nor missing_target()).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit a3722bcbbd850bf02aea19d58de112ef513cb2f1
Author: Jeff King <peff@peff.net>
Date: Sun Mar 24 08:08:38 2019 -0400
http: factor out curl result code normalization
We make some requests with CURLOPT_FAILONERROR and some without, and
then handle_curl_result() normalizes any failures to a uniform CURLcode.
There are some other code paths in the dumb-http walker which don't use
handle_curl_result(); let's pull the normalization into its own function
so it can be reused.
Arguably those code paths would benefit from the rest of
handle_curl_result(), notably the auth handling. But retro-fitting it
now would be a lot of work, and in practice it doesn't matter too much
(whatever authentication we needed to make the initial contact with the
server is generally sufficient for the rest of the dumb-http requests).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit d3322eb28b142a893fbc03142724bb54e95990a6
Author: Jeff King <peff@peff.net>
Date: Thu Mar 21 05:28:54 2019 -0400
refs/files-backend: don't look at an aborted transaction
When deleting refs, we hold packed-refs.lock and prepare a packed
transaction to drop the refs from the packed-refs file. If it turns out
that we don't need to rewrite the packed refs (e.g., because none of the
deletions were present in the file), then we abort the transaction.
If that abort succeeds, then the transaction struct will have been
freed, and we set our local pointer to NULL so we don't look at it
again.
However, if it fails, then the struct will _still_ have been freed
(because ref_transaction_abort() always frees). But we don't clean up
the pointer, and will jump to our cleanup code, which will try to abort
it again, causing a use-after-free.
It's actually impossible for this to trigger in practice, since
packed_transaction_abort() will never return anything but success. But
let's fix it anyway, since that's more than we should assume about the
packed-refs code (after all, we are already bothering to check for an
error result which cannot be triggered).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 249e8dc73ea54aa09d828cf83f5a5de6bf5702f9
Author: Jeff King <peff@peff.net>
Date: Thu Mar 21 05:28:44 2019 -0400
refs/files-backend: handle packed transaction prepare failure
In files_transaction_prepare(), if we have to delete some refs, we use a
subordinate packed_transaction to do so. It's rare for that
sub-transaction's prepare step to fail, since we hold the packed-refs
lock. But if it does, we trigger a BUG() due to these steps:
- we've attached the packed transaction to the files transaction as
backend_data->packed_transaction
- when the prepare step fails, the packed transaction cleans itself
up, putting itself into the CLOSED state
- the error value from preparing the packed transaction lets us know
in files_transaction_prepare() that we should also clean up and
return an error. We call files_transaction_cleanup(), which tries to
abort backend_data->packed_transaction. Since it's already CLOSED,
that triggers an assertion in ref_transaction_abort().
We can fix that by disconnecting the packed transaction from the outer
files transaction, and then free-ing (not aborting!) it ourselves.
A few other options/alternatives I considered:
- we could just make it a noop to abort a CLOSED transaction. But that
seems less safe, since clearly this code expects (and enforces) a
particular set of state transitions.
- we could have files_transaction_cleanup() selectively call abort()
vs free() based on the state of the on the packed transaction.
That's basically a more restricted version of the above, but also
potentially unsafe.
- instead of disconnecting backend_data->packed_transaction on error,
we could wait to install it until we successfully prepare. That
might make the flow a little simpler, but it introduces a hassle.
Earlier parts of files_transaction_prepare() that encounter an error
will jump to the cleanup label, and expect that cleaning up the
outer transaction will clean up the packed transaction, too. We'd
have to adjust those sites to clean up the packed transaction.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 584b62c37b6374a0406d43710edff3b31a1874e5
Author: Beat Bolli <dev+git@drbeat.li>
Date: Thu Mar 21 22:06:17 2019 +0100
unicode: update the width tables to Unicode 12
Now that Unicode 12 has been announced[0], update the character
width tables to the new version.
[0] http://blog.unicode.org/2019/03/announcing-unicode-standard-version-120.html
Signed-off-by: Beat Bolli <dev+git@drbeat.li>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 5ae18df9d8ed27625f81974c3fb2db179a23ca2d
Author: Jeff Hostetler <jeffhost@microsoft.com>
Date: Thu Mar 21 12:36:15 2019 -0700
midx: during verify group objects by packfile to speed verification
Teach `multi-pack-index verify` to sort the set of object by
packfile so that only one packfile needs to be open at a time.
This is a performance improvement. Previously, objects were
verified in OID order. This essentially requires all packfiles
to be open at the same time. If the number of packfiles exceeds
the open file limit, packfiles would be LRU-closed and re-opened
many times.
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 430efb8a74bd9ce9b6019b37cda21063914b0038
Author: Jeff Hostetler <jeffhost@microsoft.com>
Date: Thu Mar 21 12:36:14 2019 -0700
midx: add progress indicators in multi-pack-index verify
Add progress indicators to more parts of midx verify.
Use sparse progress indicator for object iteration.
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit d829223a4256d2a6f0e07425ba3828d28bda7596
Author: Jeff Hostetler <jeffhost@microsoft.com>
Date: Thu Mar 21 12:36:13 2019 -0700
trace2:data: add trace2 data to midx
Log multi-pack-index command mode.
Log number of objects and packfiles in the midx.
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 9d81ecb52b5e6611f66c968884dde42928350b18
Author: Jeff Hostetler <jeffhost@microsoft.com>
Date: Thu Mar 21 12:36:11 2019 -0700
progress: add sparse mode to force 100% complete message
Add new start_sparse_progress() and start_delayed_sparse_progress()
constructors and "sparse" flag to struct progress.
Teach stop_progress() to force a 100% complete progress message before
printing the final "done" message when "sparse" is set.
Calling display_progress() for every item in a large set can
be expensive. If callers try to filter this for performance
reasons, such as emitting every k-th item, progress would
not reach 100% unless they made a final call to display_progress()
with the item count before calling stop_progress().
Now this is automatic when "sparse" is set.
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit a7256debd4b6ba9f6ccb94c0958ef48cdd8cb664
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Tue Mar 19 16:39:10 2019 +0700
checkout.txt: note about losing staged changes with --merge
If you have staged changes in path A and perform 'checkout
--merge' (which could result in conflicts in a totally unrelated path
B), changes in A will be gone. Which is unexpected. We are supposed
to keep all changes, or kick and scream otherwise.
This is the result of how --merge is implemented, from the very first
day in 1be0659efc (checkout: merge local modifications while switching
branches., 2006-01-12):
1. a merge is done, unmerged entries are collected
2. a hard switch to a new branch is done, then unmerged entries added
back
There is no trivial fix for this. Going with 3-way merge one file at a
time loses rename detection. Going with 3-way merge by trees requires
teaching the algorithm to pick up staged changes. And even if we detect
staged changes with --merge and abort for safety, an option to continue
--merge is very weird. Such an option would keep worktree changes, but
drop staged changes.
Because the problem has been with us since the introduction of --merge
and everybody has been pretty happy (except Phillip, who found this
problem), I'll just take a note here to acknowledge it and wait for
merge wizards to come in and work their magic. There may be a way
forward [1].
[1] CABPp-BFoL_U=bzON4SEMaQSKU2TKwnOgNqjt5MUaOejTKGUJxw@mail.gmail.com
Reported-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit ab5af825db8beaf623f8ac95e4b4179ec1b9569e
Author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Mon Mar 18 18:38:22 2019 +0700
unpack-trees: fix oneway_merge accidentally carry over stage index
Phillip found out that 'git checkout -f <branch>' does not restore
conflict/unmerged files correctly. All tracked files should be taken
from <branch> and all non-zero stages removed. Most of this is true,
except that the final file could be in stage one instead of zero.
"checkout -f" (among other commands) does this with one-way merge, which
is supposed to take stat info from the index and everything else from
the given tree. The add_entry(.., old, ...) call in oneway_merge()
though will keep stage index from the index.
This is normally not a problem if the entry from the index is
normal (stage #0). But if there is a conflict, stage #0 does not exist
and we'll get stage #1 entry as "old" variable, which gets recorded in
the final index. Fix it by clearing stage mask.
This bug probably comes from b5b425074e (git-read-tree: make one-way
merge also honor the "update" flag, 2005-06-07). Before this commit, we
may create the final ("dst") index entry from the one in index, but we
do clear CE_STAGEMASK.
I briefly checked two- and three-way merge functions. I think we don't
have the same problem in those.
Reported-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 95be717cd5a5d4956a5152210176e598cf49ec75
Author: Jeff King <peff@peff.net>
Date: Wed Mar 20 16:22:15 2019 -0400
parse_opt_ref_sorting: always use with NONEG flag
The "--sort" parameter of for-each-ref, etc, does not handle negation,
and instead returns an error to the parse-options code. But neither
piece of code prints anything for the user, which may leave them
confused:
$ git for-each-ref --no-sort
$ echo $?
129
As the comment in the callback function notes, this probably should
clear the list, which would make it consistent with other list-like
options (i.e., anything that uses OPT_STRING_LIST currently).
Unfortunately that's a bit tricky due to the way the ref-filter code
works. But in the meantime, let's at least make the error a little less
confusing:
- switch to using PARSE_OPT_NONEG in the option definition, which will
cause the options code to produce a useful message
- since this was cut-and-pasted to four different spots, let's define
a single OPT_REF_SORT() macro that we can use everywhere
- the callback can use BUG_ON_OPT_NEG() to make sure the correct flags
are used (incidentally, this also satisfies -Wunused-parameters,
since we're now looking at "unset")
- expand the comment into a NEEDSWORK to make it clear that the
direction is right, but the details need to be worked out
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 2eb6f09f7d9c02266f7e6ac8b1591abc8b10278d
Author: Todd Zullinger <tmz@pobox.com>
Date: Wed Mar 20 14:03:29 2019 -0400
completion: use __git when calling --list-cmds
As we made --list-cmds read the local configuration file in an
earlier step, the completion.commands variable respects repo-level
configuration. Use __git which ensures that the proper repo config
is consulted if the command line contains 'git -C /some/other/repo'.
Suggested-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 057ab54b6646fbdabc8c953299f218081ff67456
Author: Jeff King <peff@peff.net>
Date: Wed Mar 20 14:03:28 2019 -0400
completion: fix multiple command removals
Commit 6532f3740b ("completion: allow to customize the completable
command list", 2018-05-20) tried to allow multiple space-separated
entries in completion.commands. To do this, it copies each parsed token
into a strbuf so that the result is NUL-terminated.
However, for tokens starting with "-", it accidentally passes the
original non-terminated string, meaning that only the final one worked.
Switch to using the strbuf.
Reported-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 402e3e1500b3bce5cee9f903f8aa691a8010e76a
Author: Todd Zullinger <tmz@pobox.com>
Date: Wed Mar 20 14:03:27 2019 -0400
t9902: test multiple removals via completion.commands
6532f3740b ("completion: allow to customize the completable command
list", 2018-05-20) added the completion.commands config variable.
Multiple commands may be added or removed, separated by a space.
Demonstrate the failure of multiple removals.
Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 83b0ecf333e518867935f6b12c18294a8a7f5017
Author: Jeff King <peff@peff.net>
Date: Wed Mar 20 14:03:26 2019 -0400
git: read local config in --list-cmds
Normally code that is checking config before we've decided to do
setup_git_directory() would use read_early_config(), which uses
discover_git_directory() to tentatively see if we're in a repo,
and if so to add it to the config sequence.
But list_cmds() uses the caching configset mechanism which
rightly does not use read_early_config(), because it has no
idea if it's being called early.
Call setup_git_directory_gently() so we can pick up repo-level
config (like completion.commands).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 8e407bc817febdf1ff2edcce01945b3eac6d376b
Author: Thomas Gummerer <t.gummerer@gmail.com>
Date: Wed Mar 20 22:49:55 2019 +0000
stash: setup default diff output format if necessary
In the scripted 'git stash show' when no arguments are passed, we just
pass '--stat' to 'git diff'. When any argument is passed to 'stash
show', we no longer pass '--stat' to 'git diff', and pass whatever
flags are passed directly through to 'git diff'.
By default 'git diff' shows the patch output. So when a user uses
'git stash show --patience', they would be shown the diff as expected,
using the patience algorithm. '--patience' in this case only changes
the diff algorithm, but does not cause 'git diff' to show the diff by
itself. The diff is shown because that's the default behaviour of
'git diff'.
In the C version of 'git stash show', we try to emulate that behaviour
using the internal diff API. However we forgot to set up the default
output format, in case it wasn't set by any of the flags that were
passed through. So 'git stash show --patience' in the builtin version
of stash would be completely silent, while it would show the diff in
the scripted version.
The same thing would happen for other flags that only affect the way a
patch is displayed, rather than switching to a different output format
than the default one.
Fix this by setting up the default output format for 'git diff'.
Reported-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit b12457ad32d4f28896ad72e24134be2bc69419fe
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed Mar 20 14:08:02 2019 -0700
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit c71b5d9ffbddea4b8302448b2544d4080c0340ee
Merge: d9bf08499 f8f678715
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Wed Mar 20 14:04:55 2019 -0700
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
commit 9a1180fc304ad9831641e5788e9c8d3dfc10ccdd
Author: Jeff King <peff@peff.net>
Date: Wed Mar 20 04:16:42 2019 -0400
pretty: drop unused strbuf from parse_padding_placeholder()
Unlike other parts of the --pretty user-format expansion,
this function is not actually writing to the output, but
instead just storing the padding values into a context
struct. We don't need to be passed a strbuf at all.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit da55ff3d84b9edc635aba4a986de25ec219acd7a
Author: Jeff King <peff@peff.net>
Date: Wed Mar 20 04:16:36 2019 -0400
pretty: drop unused "type" parameter in needs_rfc2047_encoding()
The "should we encode" check was split off from add_rfc2047() into its
own function in 41dd00bad3 (format-patch: fix rfc2047 address encoding
with respect to rfc822 specials, 2012-10-18). But only the "add" half
needs to know the rfc2047_type, since it only affects _how_ we encode,
not whether we do.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 5205749d2ca81ea1d124ba7d799f4b319084ca68
Author: Jeff King <peff@peff.net>
Date: Wed Mar 20 04:16:27 2019 -0400
parse-options: drop unused ctx parameter from show_gitcomp()
The completion display doesn't actually care about where we are in the
parsing. It's generated completely from the set of available options. So
we don't need to see the parse-options context struct at all.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 0f804b0bac39fb696ea74b8dd59549935ec9ca00
Author: Jeff King <peff@peff.net>
Date: Wed Mar 20 04:16:14 2019 -0400
fetch_pack(): drop unused parameters
We don't need the caller of fetch_pack() to pass in "dest", which is the
remote URL. Since ba227857d2 (Reduce the number of connects when
fetching, 2008-02-04), the caller is responsible for calling
git_connect() itself, and our "dest" parameter is unused.
That commit also started passing us the resulting "conn" child_process
from git_connect(). But likewise, we do not need do anything with it.
The descriptors in "fd" are enough for us, and the caller is responsible
for cleaning up "conn".
We can just drop both parameters.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit c5c33504c906f6bf09fe00a1a32c6c4bdb76ed0f
Author: Jeff King <peff@peff.net>
Date: Wed Mar 20 04:15:48 2019 -0400
report_path_error(): drop unused prefix parameter
This hasn't been used since 17ddc66e70 (convert report_path_error to
take struct pathspec, 2013-07-14), as the names in the struct will have
already been prefixed when they were parsed.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit df351c6e676e8eea0defa00ea919ad7da6bd03f1
Author: Jeff King <peff@peff.net>
Date: Wed Mar 20 04:15:27 2019 -0400
unpack-trees: drop unused error_type parameters
The verify_clean_subdirectory() helper takes an error_type parameter
from the caller, but doesn't actually use it. Instead, when it calls
add_rejected_path() it passes NOT_UPTODATE_DIR, its own custom error
type which is more specific than what the caller provides. Likewise for
verify_clean_submodule(), which always passes WOULD_LOSE_SUBMODULE.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 664296985c2f05df83da9b859c258d97e6a11ba3
Author: Jeff King <peff@peff.net>
Date: Wed Mar 20 04:15:07 2019 -0400
unpack-trees: drop name_entry from traverse_by_cache_tree()
We pull the names from the existing index rather than the tree entry,
which is after all the point of this function. Let's drop the unused
"names" parameter.
Note that we leave the "nr_names" parameter, as it tells us how many
trees we are traversing (and thus how many index stages to set up).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 04c4c766ec8252674496ab232b63c1860bcbc0a9
Author: Jeff King <peff@peff.net>
Date: Wed Mar 20 04:14:30 2019 -0400
test-date: drop unused "now" parameter from parse_dates()
We only need the current time for relative dates like "5
minutes ago", and those are parsed only through approxidate,
not the strict parser used by parse_dates().
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 5bb1cb6d023fb1087694b8d7148bc6f3f306efc5
Author: Jeff King <peff@peff.net>
Date: Wed Mar 20 04:14:07 2019 -0400
update-index: drop unused prefix_length parameter from do_reupdate()
The prefix is always a NUL-terminated string, and we just end up passing
it along to parse_pathspec() anyway (which does not even take a length).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit af117077d38af01f585adb16ded9deccb559b0b6
Author: Jeff King <peff@peff.net>
Date: Wed Mar 20 04:14:01 2019 -0400
log: drop unused "len" from show_tagger()
We pass the length of the found "tagger" line to show_tagger(), but it
does not use it; instead, it passes the string to pp_user_info(), which
reads until newline or NUL. This is OK for our purposes because we
always read the object contents into a buffer with an extra NUL (and
indeed, our sole caller already relies on this by using starts_with).
Let's drop the ignored parameter. And while we're touching the caller,
let's use skip_prefix() to avoid a magic number.
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}