Mirror of https://git.kernel.org/pub/scm/git/git.git/ https://git.shady.money/git/atom?h=v2.34.2 2021-10-29T22:43:16Z 2021-10-29T22:43:16Z Junio C Hamano gitster@pobox.com 2021-10-29T22:43:16Z urn:sha1:9a95a9f230c30b44990e616dff154ab78f0aa60d Fix long-standing shell syntax error in the completion script. * re/completion-fix-test-equality: completion: fix incorrect bash/zsh string equality check 2021-10-28T16:33:19Z Robert Estelle robertestelle@gmail.com 2021-10-25T22:29:33Z urn:sha1:46b05852863a532a897f09a8461586f3d2d38693 In the basic `[`/`test` command, the string equality operator is a single `=`. The `==` operator is only available in `[[`, which is a bash-ism also supported by zsh. This mix-up was causing the following completion error in zsh: > __git_ls_files_helper:7: = not found (That message refers to the extraneous symbol in `==` ← `=`). This updates that comparison to use a single `=` inside the basic `[ … ]` test conditional. Although this fix is inconsistent with the other comparisons in this file, which use `[[ … == … ]]`, and the two expressions are functionally identical in this context, that approach was rejected due to a preference for `[`. Signed-off-by: Robert Estelle <robertestelle@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2021-10-18T22:47:56Z Junio C Hamano gitster@pobox.com 2021-10-18T22:47:56Z urn:sha1:223a1bfb5821387981c700654e4edd2443c5a7fc The "--preserve-merges" option of "git rebase" has been removed. * js/retire-preserve-merges: sequencer: restrict scope of a formerly public function rebase: remove a no-longer-used function rebase: stop mentioning the -p option in comments rebase: remove obsolete code comment rebase: drop the internal `rebase--interactive` command git-svn: drop support for `--preserve-merges` rebase: drop support for `--preserve-merges` pull: remove support for `--rebase=preserve` tests: stop testing `git rebase --preserve-merges` remote: warn about unhandled branch.<name>.rebase values t5520: do not use `pull.rebase=preserve` 2021-10-13T22:15:58Z Junio C Hamano gitster@pobox.com 2021-10-13T22:15:58Z urn:sha1:62f035aee3ff53aa9c5296d5acb4c4b683ba314d Teach "git help -c" into helping the command line completion of configuration variables. * ab/help-config-vars: help: move column config discovery to help.c library help / completion: make "git help" do the hard work help tests: test --config-for-completion option & output help: simplify by moving to OPT_CMDMODE() help: correct logic error in combining --all and --guides help: correct logic error in combining --all and --config help tests: add test for --config output help: correct usage & behavior of "git help --guides" help: correct the usage string in -h and documentation 2021-10-13T22:15:57Z Junio C Hamano gitster@pobox.com 2021-10-13T22:15:57Z urn:sha1:a5e61a4225a7319ab5fdd6d7b63e250f5b08255c Mostly preliminary clean-up in the hook API. * ab/config-based-hooks-1: hook-list.h: add a generated list of hooks, like config-list.h hook.c users: use "hook_exists()" instead of "find_hook()" hook.c: add a hook_exists() wrapper and use it in bugreport.c hook.[ch]: move find_hook() from run-command.c to hook.c Makefile: remove an out-of-date comment Makefile: don't perform "mv $@+ $@" dance for $(GENERATED_H) Makefile: stop hardcoding {command,config}-list.h Makefile: mark "check" target as .PHONY 2021-10-13T22:15:57Z Junio C Hamano gitster@pobox.com 2021-10-13T22:15:57Z urn:sha1:a7c2daa06d6f7d8fd13a1d72f23741acbaeba522 Various fixes in code paths that move untracked files away to make room. * en/removing-untracked-fixes: Documentation: call out commands that nuke untracked files/directories Comment important codepaths regarding nuking untracked files/dirs unpack-trees: avoid nuking untracked dir in way of locally deleted file unpack-trees: avoid nuking untracked dir in way of unmerged file Change unpack_trees' 'reset' flag into an enum Remove ignored files by default when they are in the way unpack-trees: make dir an internal-only struct unpack-trees: introduce preserve_ignored to unpack_trees_options read-tree, merge-recursive: overwrite ignored files by default checkout, read-tree: fix leak of unpack_trees_options.dir t2500: add various tests for nuking untracked files 2021-10-12T20:51:28Z Junio C Hamano gitster@pobox.com 2021-10-12T20:51:28Z urn:sha1:1c23cc1344423a4fe519ba8ffab81a68db4f51f4 Error diagnostics improvement. * rs/xopen-reports-open-failures: use xopen() to handle fatal open(2) failures xopen: explicitly report creation failures 2021-10-12T20:51:24Z Junio C Hamano gitster@pobox.com 2021-10-12T20:51:24Z urn:sha1:4e408f1060bc677a7d6f17d349f05203ef4b76f3 Update to the command line completion (in contrib/) for tcsh. * ti/tcsh-completion-regression-fix: completion: tcsh: Fix regression by drop of wrapper functions 2021-10-12T20:51:24Z Junio C Hamano gitster@pobox.com 2021-10-12T20:51:24Z urn:sha1:c5d1c7028d06670fb8b3e851aa19316a7e2d2a64 Command line completion updates. * fc/completion-updates: completion: bash: add correct suffix in variables completion: bash: fix for multiple dash commands completion: bash: fix for suboptions with value completion: bash: fix prefix detection in branch.* 2021-09-27T21:47:59Z Ævar Arnfjörð Bjarmason avarab@gmail.com 2021-09-27T12:54:25Z urn:sha1:9865b6e6a4ca1e895fd473c827cf1822f3bd8249 In C it isn't required to specify that all members of a struct are zero'd out to 0, NULL or '\0', just providing a "{ 0 }" will accomplish that. Let's also change code that provided N zero'd fields to just provide one, and change e.g. "{ NULL }" to "{ 0 }" for consistency. I.e. even if the first member is a pointer let's use "0" instead of "NULL". The point of using "0" consistently is to pick one, and to not have the reader wonder why we're not using the same pattern everywhere. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>