| 69986e1 | Junio C Hamano | 19 October 2020, 16:58:42 UTC | Git 2.29 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 October 2020, 16:58:42 UTC |
| 2a809ec | Junio C Hamano | 18 October 2020, 20:16:08 UTC | Merge tag 'l10n-2.29.0-rnd2' of git://github.com/git-l10n/git-po l10n for Git 2.29.0 round 2 * tag 'l10n-2.29.0-rnd2' of git://github.com/git-l10n/git-po: l10n: zh_CN: for git v2.29.0 l10n round 1 and 2 l10n: de.po: Update German translation for Git 2.29.0 l10n: vi(5013t): Updated translation for v2.29.0 rd2 l10n: pt_PT: make on po/pt_PT.po l10n: Portuguese translation team has changed. Wohoo! l10n: bg.po: Updated Bulgarian translation (5013t) l10n: sv.po: Update Swedish translation (5013t0f0u) l10n: it.po: update the Italian translation l10n: tr: v2.29.0 round 2 l10n: zh_TW.po: v2.29.0 round 2 (2 untranslated) l10n: fr: v2.29.0 rnd 2 l10n: git.pot: v2.29.0 round 2 (1 new, 1 removed) l10n: fr: v2.29.0 rnd 1 l10n: it.po: update the Italian translation for Git 2.29.0 round 1 l10n: tr: v2.29.0 round 1 l10n: Update Catalan translation l10n: git.pot: v2.29.0 round 1 (124 new, 42 removed) | 18 October 2020, 20:16:08 UTC |
| 2b4cb00 | Jiang Xin | 18 October 2020, 01:56:33 UTC | Merge branch 'master' of github.com:Softcatala/git-po * 'master' of github.com:Softcatala/git-po: l10n: Update Catalan translation | 18 October 2020, 01:56:33 UTC |
| d9488fe | Jiang Xin | 24 September 2020, 00:51:52 UTC | l10n: zh_CN: for git v2.29.0 l10n round 1 and 2 Translate 124 new messages (5013t0f0u) for git 2.29.0. Reviewed-by: 依云 <lilydjwg@gmail.com> Reviewed-by: Fangyi Zhou <me@fangyi.io> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 18 October 2020, 01:55:03 UTC |
| 430cabb | Junio C Hamano | 17 October 2020, 20:10:58 UTC | Merge https://github.com/prati0100/git-gui * https://github.com/prati0100/git-gui: git-gui: blame: prevent tool tips from sticking around after Command-Tab git-gui: improve dark mode support git-gui: fix mixed tabs and spaces; prefer tabs | 17 October 2020, 20:10:58 UTC |
| 38c2ac2 | Pratyush Yadav | 17 October 2020, 09:35:27 UTC | Merge branch 'sh/blame-tooltip' Make sure `git gui blame` tooltips are destroyed once the window loses focus on MacOS. * sh/blame-tooltip: git-gui: blame: prevent tool tips from sticking around after Command-Tab | 17 October 2020, 09:35:27 UTC |
| b297e03 | Stefan Haller | 13 October 2020, 13:26:43 UTC | git-gui: blame: prevent tool tips from sticking around after Command-Tab On Mac, tooltips are not automatically removed when a window loses focus. Furthermore, mouse-move events are only dispatched to the active window, which means that if we Command-tab to another application while a tool tip is showing, the tool tip will stay there forever (in front of other applications). So we must hide it manually when we lose focus. Do this unconditionally here (i.e. without if {[is_MacOSX]}); it shouldn't hurt on other platforms, even though they don't seem to have this problem. Signed-off-by: Stefan Haller <stefan@haller-berlin.de> Signed-off-by: Pratyush Yadav <me@yadavpratyush.com> | 17 October 2020, 09:34:35 UTC |
| a5fa49f | Junio C Hamano | 15 October 2020, 18:58:37 UTC | Git 2.29-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 October 2020, 18:58:37 UTC |
| 0cc3679 | Matthias Rüster | 12 October 2020, 15:10:49 UTC | l10n: de.po: Update German translation for Git 2.29.0 Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com> Reviewed-by: Phillip Szelat <phillip.szelat@gmail.com> Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com> | 15 October 2020, 17:19:51 UTC |
| d10afaf | Jiang Xin | 14 October 2020, 01:35:03 UTC | Merge branch 'pt-PT' of github.com:git-l10n-pt-PT/git-po * 'pt-PT' of github.com:git-l10n-pt-PT/git-po: l10n: pt_PT: make on po/pt_PT.po l10n: Portuguese translation team has changed. Wohoo! | 14 October 2020, 01:35:03 UTC |
| 8d41d10 | Tran Ngoc Quan | 13 October 2020, 01:38:20 UTC | l10n: vi(5013t): Updated translation for v2.29.0 rd2 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 13 October 2020, 01:38:20 UTC |
| c8774d0 | Daniel Santos | 12 October 2020, 08:47:24 UTC | l10n: pt_PT: make on po/pt_PT.po Pull from the language Coordenator repository and `make` done at the top-level directory. Signed-off-by: Daniel Santos <hello@brighterdan.com> | 12 October 2020, 09:05:29 UTC |
| f055b51 | Daniel Santos | 12 October 2020, 08:32:37 UTC | l10n: Portuguese translation team has changed. Wohoo! I am excited. Because I like a lot languages, and because I believe this is the way to contribute to a large number of Portuguese speaking person. Jiang Xin and last Portuguese team gave me the lead. Thank you very much. Honored to be a part of such a project. Signed-off-by: Daniel Santos <hello@brighterdan.com> | 12 October 2020, 09:05:29 UTC |
| 20c4a22 | Jiang Xin | 12 October 2020, 07:19:19 UTC | Merge branch 'master' of github.com:alshopov/git-po * 'master' of github.com:alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (5013t) | 12 October 2020, 07:19:19 UTC |
| 844fd55 | Jiang Xin | 12 October 2020, 07:18:03 UTC | Merge branch 'master' of github.com:nafmo/git-l10n-sv * 'master' of github.com:nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (5013t0f0u) | 12 October 2020, 07:18:03 UTC |
| 4ba082a | Jiang Xin | 12 October 2020, 07:11:30 UTC | Merge branch 'update-italian-translation' of github.com:AlessandroMenti/git-po * 'update-italian-translation' of github.com:AlessandroMenti/git-po: l10n: it.po: update the Italian translation | 12 October 2020, 07:11:30 UTC |
| 9a1497f | Alexander Shopov | 11 October 2020, 12:46:54 UTC | l10n: bg.po: Updated Bulgarian translation (5013t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 11 October 2020, 13:01:10 UTC |
| db7ca47 | Peter Krefting | 11 October 2020, 10:54:47 UTC | l10n: sv.po: Update Swedish translation (5013t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 11 October 2020, 10:54:47 UTC |
| c0ebb74 | Jiang Xin | 11 October 2020, 08:12:01 UTC | Merge branch 'l10n/zh_TW/201010' of github.com:l10n-tw/git-po * 'l10n/zh_TW/201010' of github.com:l10n-tw/git-po: l10n: zh_TW.po: v2.29.0 round 2 (2 untranslated) | 11 October 2020, 08:12:01 UTC |
| 4f03210 | Alessandro Menti | 10 October 2020, 07:31:36 UTC | l10n: it.po: update the Italian translation Update the Italian translation for Git 2.29.0, round 2. Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it> | 11 October 2020, 08:06:13 UTC |
| bb7de4d | Jiang Xin | 11 October 2020, 01:46:46 UTC | Merge branch '2.29-r2' of github.com:bitigchi/git-po * '2.29-r2' of github.com:bitigchi/git-po: l10n: tr: v2.29.0 round 2 | 11 October 2020, 01:46:46 UTC |
| fbc6b82 | Emir Sarı | 10 October 2020, 11:41:15 UTC | l10n: tr: v2.29.0 round 2 Signed-off-by: Emir Sarı <bitigchi@me.com> | 10 October 2020, 11:41:15 UTC |
| bc66326 | pan93412 | 10 October 2020, 11:34:56 UTC | l10n: zh_TW.po: v2.29.0 round 2 (2 untranslated) Signed-off-by: pan93412 <pan93412@gmail.com> | 10 October 2020, 11:34:56 UTC |
| 8a62da9 | Jean-Noël Avila | 10 October 2020, 11:11:18 UTC | l10n: fr: v2.29.0 rnd 2 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> | 10 October 2020, 11:11:18 UTC |
| 1fd0dd7 | Jiang Xin | 10 October 2020, 01:33:19 UTC | l10n: git.pot: v2.29.0 round 2 (1 new, 1 removed) Generate po/git.pot from v2.29.0-rc1 for git v2.29.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 10 October 2020, 01:33:19 UTC |
| b4a48be | Jiang Xin | 10 October 2020, 01:22:36 UTC | Merge tag 'v2.29.0-rc1' of github.com:git/git Git 2.29-rc1 * tag 'v2.29.0-rc1' of github.com:git/git: Git 2.29-rc1 doc: fix the bnf like style of some commands doc: git-remote fix ups doc: use linkgit macro where needed. git-bisect-lk2009: make continuation of list indented ci: do not skip tagged revisions in GitHub workflows ci: skip GitHub workflow runs for already-tested commits/trees tests: avoid using the branch name `main` t1415: avoid using `main` as ref name Makefile: ASCII-sort += lists help: do not expect built-in commands to be hardlinked index-pack: make get_base_data() comment clearer index-pack: drop type_cas mutex index-pack: restore "resolving deltas" progress meter compat/mingw.h: drop extern from function declaration GitHub workflow: automatically follow minor updates of setup-msbuild t5534: split stdout and stderr redirection | 10 October 2020, 01:22:36 UTC |
| d4a3924 | Junio C Hamano | 09 October 2020, 04:53:09 UTC | Git 2.29-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 October 2020, 04:53:26 UTC |
| 62564ba | Junio C Hamano | 09 October 2020, 04:53:26 UTC | Merge branch 'js/default-branch-name-part-3' Test preparation for the switch of default branch name continues. * js/default-branch-name-part-3: tests: avoid using the branch name `main` t1415: avoid using `main` as ref name | 09 October 2020, 04:53:26 UTC |
| 20a00ab | Junio C Hamano | 09 October 2020, 04:53:26 UTC | Merge branch 'js/ci-ghwf-dedup-tests' The logic to skip testing on the tagged commit and the tag itself was not quite consistent which led to failure of Windows test tasks. It has been revamped to consistently skip revisions that have already been tested, based on the tree object of the revision. * js/ci-ghwf-dedup-tests: ci: do not skip tagged revisions in GitHub workflows ci: skip GitHub workflow runs for already-tested commits/trees | 09 October 2020, 04:53:26 UTC |
| d620daa | Junio C Hamano | 09 October 2020, 04:53:26 UTC | Merge branch 'ja/misc-doc-fixes' Doc fixes. * ja/misc-doc-fixes: doc: fix the bnf like style of some commands doc: git-remote fix ups doc: use linkgit macro where needed. git-bisect-lk2009: make continuation of list indented | 09 October 2020, 04:53:26 UTC |
| e245b4e | Junio C Hamano | 09 October 2020, 04:53:26 UTC | Merge branch 'dl/makefile-sort' Makefile clean-up. * dl/makefile-sort: Makefile: ASCII-sort += lists | 09 October 2020, 04:53:26 UTC |
| 86e1007 | Junio C Hamano | 09 October 2020, 04:53:26 UTC | Merge branch 'js/no-builtins-on-disk-option' Hotfix to breakage introduced in the topic in v2.29-rc0 * js/no-builtins-on-disk-option: help: do not expect built-in commands to be hardlinked | 09 October 2020, 04:53:26 UTC |
| 08f06e5 | Junio C Hamano | 09 October 2020, 04:53:26 UTC | Merge branch 'js/ghwf-setup-msbuild-update' CI update. * js/ghwf-setup-msbuild-update: GitHub workflow: automatically follow minor updates of setup-msbuild | 09 October 2020, 04:53:26 UTC |
| c7ac8c0 | Junio C Hamano | 09 October 2020, 04:53:25 UTC | Merge branch 'jk/index-pack-hotfixes' Hotfix and clean-up for the jt/threaded-index-pack topic that has graduated to v2.29-rc0. * jk/index-pack-hotfixes: index-pack: make get_base_data() comment clearer index-pack: drop type_cas mutex index-pack: restore "resolving deltas" progress meter | 09 October 2020, 04:53:26 UTC |
| abac91e | Junio C Hamano | 09 October 2020, 04:53:25 UTC | Merge branch 'dl/mingw-header-cleanup' Header clean-up. * dl/mingw-header-cleanup: compat/mingw.h: drop extern from function declaration | 09 October 2020, 04:53:25 UTC |
| f491ce9 | Junio C Hamano | 09 October 2020, 04:53:25 UTC | Merge branch 'hx/push-atomic-with-cert' Hotfix to a recently added test script. * hx/push-atomic-with-cert: t5534: split stdout and stderr redirection | 09 October 2020, 04:53:25 UTC |
| 9f443f5 | Jean-Noël Avila | 08 October 2020, 20:23:57 UTC | doc: fix the bnf like style of some commands In command line options, variables are entered between < and > Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2020, 21:01:19 UTC |
| 89eed6f | Jean-Noël Avila | 08 October 2020, 20:23:56 UTC | doc: git-remote fix ups Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2020, 21:01:18 UTC |
| 49fbf9e | Jean-Noël Avila | 08 October 2020, 20:23:55 UTC | doc: use linkgit macro where needed. Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2020, 21:01:18 UTC |
| df49a80 | Jean-Noël Avila | 08 October 2020, 20:23:54 UTC | git-bisect-lk2009: make continuation of list indented That's clearer asciidoc formatting. Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2020, 21:01:15 UTC |
| 4463ce7 | Johannes Schindelin | 08 October 2020, 15:29:35 UTC | ci: do not skip tagged revisions in GitHub workflows When `master` is tagged, and then both `master` and the tag are pushed, Travis CI will happily build both. That is a waste of energy, which is why we skip the build for `master` in that case. Our GitHub workflow is also triggered by tags. However, the run would fail because the `windows-test` jobs are _not_ skipped on tags, but the `windows-build` job _is skipped (and therefore fails to upload the build artifacts needed by the test jobs). In addition, we just added logic to our GitHub workflow that will skip runs altogether if there is already a successful run for the same commit or at least for the same tree. Let's just change the GitHub workflow to no longer specifically skip tagged revisions. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2020, 18:58:41 UTC |
| 7d78d5f | Johannes Schindelin | 08 October 2020, 15:29:34 UTC | ci: skip GitHub workflow runs for already-tested commits/trees When pushing a commit that has already passed a CI or PR build successfully, it makes sense to save some energy and time and skip the new build. Let's teach our GitHub workflow to do that. For good measure, we also compare the tree ID, which is what we actually test (the commit ID might have changed due to a reworded commit message, which should not affect the outcome of the run). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2020, 18:58:37 UTC |
| 538228e | Johannes Schindelin | 08 October 2020, 10:13:47 UTC | tests: avoid using the branch name `main` In the near future, we want to change Git's default branch name to `main`. In preparation for that, stop using it as a branch name in the test suite. Replace that branch name by `topic`, the same name we used to rename variations of `master` in b6211b89eb3 (tests: avoid variations of the `master` branch name, 2020-09-26). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2020, 17:40:18 UTC |
| a15ad5d | Johannes Schindelin | 08 October 2020, 10:13:46 UTC | t1415: avoid using `main` as ref name In preparation for a patch series that will change the fall-back for `init.defaultBranch` to `main`, let's not use `main` as ref name in this test script. Otherwise, the `git for-each-ref ... | grep main` which wants to catch those refs would also unexpectedly catch `refs/heads/main`. Since the refs in question are worktree-local ones (i.e. each worktree has their own, just like `HEAD`), and since the test case already uses a secondary worktree called "second", let's use the name "first" for those refs instead. While at it, adjust the test titles that talk about a "repo" when they meant a "worktree" instead. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2020, 17:40:16 UTC |
| 8474f26 | Denton Liu | 08 October 2020, 07:39:26 UTC | Makefile: ASCII-sort += lists In 805d9eaf5e (Makefile: ASCII-sort += lists, 2020-03-21), the += lists in the Makefile were sorted into ASCII order. Since then, more out of order elements have been introduced. Sort these lists back into ASCII order. This patch is best viewed with `--color-moved`. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 October 2020, 17:38:51 UTC |
| 01121d6 | Pratyush Yadav | 08 October 2020, 13:04:54 UTC | Merge branch 'st/dark-mode' into master Improve dark mode support. Do not hard-code widget colors and instead pull them from the current theme and update them in the options database. * st/dark-mode: git-gui: improve dark mode support | 08 October 2020, 13:04:54 UTC |
| c6b9837 | Jiang Xin | 08 October 2020, 12:27:51 UTC | Merge branch 'fr_2.29.0_rnd_1' of github.com:jnavila/git * 'fr_2.29.0_rnd_1' of github.com:jnavila/git: l10n: fr: v2.29.0 rnd 1 | 08 October 2020, 12:27:51 UTC |
| 722fc37 | Johannes Schindelin | 07 October 2020, 21:56:51 UTC | help: do not expect built-in commands to be hardlinked When building with SKIP_DASHED_BUILT_INS=YesPlease, the built-in commands are no longer present in the `PATH` as hardlinks to `git`. As a consequence, `load_command_list()` needs to be taught to find the names of the built-in commands from elsewhere. This only affected the output of `git --list-cmds=main`, but not the output of `git help -a` because the latter includes the built-in commands by virtue of them being listed in command-list.txt. The bug was detected via a patch series that turns the merge strategies included in Git into built-in commands: `git merge -s help` relies on `load_command_list()` to determine the list of available merge strategies. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 October 2020, 22:25:10 UTC |
| ec6a8f9 | Jonathan Tan | 07 October 2020, 20:16:58 UTC | index-pack: make get_base_data() comment clearer A comment mentions that we may free cached delta bases via find_unresolved_deltas(), but that function went away in f08cbf60fe (index-pack: make quantum of work smaller, 2020-09-08). Since we need to rewrite that comment anyway, make the entire comment clearer. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 October 2020, 20:32:27 UTC |
| 8dadc33 | Jean-Noël Avila | 07 October 2020, 19:55:55 UTC | l10n: fr: v2.29.0 rnd 1 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> | 07 October 2020, 19:55:55 UTC |
| 283aa91 | Alessandro Menti | 07 October 2020, 19:43:55 UTC | l10n: it.po: update the Italian translation for Git 2.29.0 round 1 Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it> | 07 October 2020, 19:45:09 UTC |
| bebe171 | Jeff King | 07 October 2020, 18:19:43 UTC | index-pack: drop type_cas mutex The type_cas lock lost all of its callers in f08cbf60fe (index-pack: make quantum of work smaller, 2020-09-08), so we can safely delete it. The compiler didn't alert us that the variable became unused, because we still call pthread_mutex_init() and pthread_mutex_destroy() on it. It's worth considering also whether that commit was in error to remove the use of the lock. Why don't we need it now, if we did before, as described in ab791dd138 (index-pack: fix race condition with duplicate bases, 2014-08-29)? I think the answer is that we now look at and assign the child_obj->real_type field in the main thread while holding the work_lock(). So we don't have to worry about racing with the worker threads. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 October 2020, 18:51:26 UTC |
| cea6915 | Jeff King | 07 October 2020, 18:19:23 UTC | index-pack: restore "resolving deltas" progress meter Commit f08cbf60fe (index-pack: make quantum of work smaller, 2020-09-08) refactored the main loop in threaded_second_pass(), but also deleted the call to display_progress() at the top of the loop. This means that users typically see no progress at all during the delta resolution phase (and for large repositories, Git appears to hang). This looks like an accident that was unrelated to the intended change of that commit, since we continue to update nr_resolved_deltas in resolve_delta(). Let's restore the call to get that progress back. We'll also add a test that confirms we generate the expected progress. This isn't perfect, as it wouldn't catch a bug where progress was delayed to the end. That was probably possible to trigger when receiving a thin pack, because we'd eventually call display_progress() from fix_unresolved_deltas(), but only once after doing all the work. However, since our test case generates a complete pack, it reliably demonstrates this particular bug and its fix. And we can't do better without making the test racy. Signed-off-by: Jeff King <peff@peff.net> Acked-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 October 2020, 18:50:09 UTC |
| fcedb37 | Denton Liu | 07 October 2020, 08:31:59 UTC | compat/mingw.h: drop extern from function declaration In 554544276a (*.[ch]: remove extern from function declarations using spatch, 2019-04-29), `extern` on function declarations were declared to be redundant and thus removed from the codebase. An `extern` was accidentally reintroduced in 08809c09aa (mingw: add a helper function to attach GDB to the current process, 2020-02-13). Remove this spurious `extern`. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 October 2020, 16:55:20 UTC |
| 17c1306 | Johannes Schindelin | 07 October 2020, 08:17:49 UTC | GitHub workflow: automatically follow minor updates of setup-msbuild It is the custom to follow minor updates of GitHub Actions automatically, by using the suffix `@v1`. Actions' maintainers will then update that `v1` ref to point to the newest. However, for `microsoft/setup-msbuild`, 889cacb6897 (ci: configure GitHub Actions for CI/PR, 2020-04-11) uses a very specific `@v1.0.0` suffix. In this instance, that is a problem: should `setup-msbuild` release a new version that intends to fix a critical bug, we won't know it, and we won't use it. Such a scenario is not theoretical. It is happening right now: https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands Let's simplify our setup, allowing us to benefit from automatically using the newest v1.x. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 October 2020, 16:54:53 UTC |
| c02efc1 | Serg Tereshchenko | 26 September 2020, 14:54:43 UTC | git-gui: improve dark mode support The colors of some ttext widgets are hard-coded. These hard-coded colors are okay with a light theme but with a dark theme some widgets are dark colored and the hard-coded ones are still light. This defeats the purpose of applying the theme and makes the UI look very awkward. Remove the hard-coded colors in ttext calls and use colors from the theme for those widgets via Text.Background and Text.Foreground from the option database. Similarly, the highlighting for the currently selected file(s) in the "Staged Files" and "Unstaged Files" sections is also hard-coded. Pull the colors for that from the current theme to make sure it is in line Signed-off-by: Serg Tereshchenko <serg.partizan@gmail.com> Signed-off-by: Pratyush Yadav <me@yadavpratyush.com> | 07 October 2020, 11:14:24 UTC |
| 2cd6e1d | Đoàn Trần Công Danh | 06 October 2020, 15:08:18 UTC | t5534: split stdout and stderr redirection On atomic pushing failure with GnuPG, we expect a very specific output in stdout due to `--porcelain` switch. On such failure, we also write down some helpful hint into stderr in order to help user understand what happens and how to continue from those failures. On a lot of system, those hint (in stderr) will be flushed first, then those messages in stdout will be flushed. In such systems, the current test code is fine as is. However, we don't have such guarantee, (at least) there're some real systems that writes those stream interleaved. On such systems, we may see the stderr stream written in the middle of stdout stream. Let's split those stream redirection. By splitting those stream, the output stream will contain exactly what we want to compare, thus, saving us a "sed" invocation. While we're at it, change the `test_i18ncmp` to `test_cmp` because we will never translate those messages (because of `--porcelain`). Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 October 2020, 19:14:14 UTC |
| ae372f1 | Emir Sarı | 06 October 2020, 13:44:21 UTC | l10n: tr: v2.29.0 round 1 Signed-off-by: Emir Sarı <bitigchi@me.com> | 06 October 2020, 13:44:21 UTC |
| 008a5d4 | Jordi Mas | 06 October 2020, 09:36:15 UTC | l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> | 06 October 2020, 09:36:15 UTC |
| e13da2d | Jiang Xin | 06 October 2020, 01:16:18 UTC | l10n: git.pot: v2.29.0 round 1 (124 new, 42 removed) Generate po/git.pot from v2.29.0-rc0 for git v2.29.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 06 October 2020, 01:16:18 UTC |
| d98273b | Junio C Hamano | 05 October 2020, 21:00:04 UTC | Git 2.29-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 October 2020, 21:01:56 UTC |
| 542b3c2 | Junio C Hamano | 05 October 2020, 21:01:56 UTC | Merge branch 'nl/credential-crlf' Loosen the parser in the receiving end of the credential protocol to allow credential helper to terminate lines with CRLF line ending, as well as LF line ending. * nl/credential-crlf: credential: treat CR/LF as line endings in the credential protocol | 05 October 2020, 21:01:56 UTC |
| 67af910 | Junio C Hamano | 05 October 2020, 21:01:56 UTC | Merge branch 'sn/fast-import-doc' Doc update. * sn/fast-import-doc: fast-import: fix typo in documentation | 05 October 2020, 21:01:56 UTC |
| 9d19e17 | Junio C Hamano | 05 October 2020, 21:01:55 UTC | Merge branch 'pb/submodule-doc-fix' Doc update. * pb/submodule-doc-fix: gitsubmodules doc: invoke 'ls-files' with '--recurse-submodules' | 05 October 2020, 21:01:55 UTC |
| 5f8c70a | Junio C Hamano | 05 October 2020, 21:01:55 UTC | Merge branch 'jk/format-auto-base-when-able' "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 | 05 October 2020, 21:01:55 UTC |
| 7da656f | Junio C Hamano | 05 October 2020, 21:01:54 UTC | Merge branch 'jk/diff-cc-oidfind-fix' "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 | 05 October 2020, 21:01:55 UTC |
| 8e3ec76 | Junio C Hamano | 05 October 2020, 21:01:54 UTC | Merge branch 'jk/refspecs-negative' "git fetch" and "git push" support negative refspecs. * jk/refspecs-negative: refspec: add support for negative refspecs | 05 October 2020, 21:01:54 UTC |
| f6b06b4 | Junio C Hamano | 05 October 2020, 21:01:53 UTC | Merge branch 'rs/archive-add-file' "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() | 05 October 2020, 21:01:53 UTC |
| e68f0a4 | Junio C Hamano | 05 October 2020, 21:01:53 UTC | Merge branch 'jt/keep-partial-clone-filter-upon-lazy-fetch' 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 | 05 October 2020, 21:01:53 UTC |
| 300cd14 | Junio C Hamano | 05 October 2020, 21:01:53 UTC | Merge branch 'td/submodule-update-quiet' "git submodule update --quiet" did not squelch underlying "rebase" and "pull" commands. * td/submodule-update-quiet: submodule update: silence underlying merge/rebase with "--quiet" | 05 October 2020, 21:01:53 UTC |
| 19dd352 | Junio C Hamano | 05 October 2020, 21:01:52 UTC | Merge branch 'jk/unused' 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() | 05 October 2020, 21:01:52 UTC |
| 8250ab0 | Junio C Hamano | 05 October 2020, 21:01:52 UTC | Merge branch 'js/cmake-vs' 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 | 05 October 2020, 21:01:52 UTC |
| 07601b5 | Junio C Hamano | 05 October 2020, 21:01:52 UTC | Merge branch 'ma/worktree-cleanups' 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 | 05 October 2020, 21:01:52 UTC |
| 34415c7 | Junio C Hamano | 05 October 2020, 21:01:51 UTC | Merge branch 'so/combine-diff-simplify' Code simplification. * so/combine-diff-simplify: diff: get rid of redundant 'dense' argument | 05 October 2020, 21:01:51 UTC |
| 58138d3 | Junio C Hamano | 05 October 2020, 21:01:50 UTC | Merge branch 'js/default-branch-name-part-2' 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 | 05 October 2020, 21:01:50 UTC |
| 0cf28f6 | Junio C Hamano | 05 October 2020, 21:01:50 UTC | Merge branch 'pm/gitk-update' "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" | 05 October 2020, 21:01:50 UTC |
| c01b041 | Junio C Hamano | 05 October 2020, 21:01:50 UTC | Merge branch 'ds/in-merge-bases-many-optim-bug' 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 | 05 October 2020, 21:01:50 UTC |
| 3be01e5 | Samanta Navarro | 04 October 2020, 11:41:01 UTC | fast-import: fix typo in documentation Signed-off-by: Samanta Navarro <ferivoz@riseup.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 October 2020, 19:56:29 UTC |
| 7d15fdb | Philippe Blain | 04 October 2020, 01:17:37 UTC | gitsubmodules doc: invoke 'ls-files' with '--recurse-submodules' `git ls-files` was never taught to respect the `submodule.recurse` configuration variable, and it is too late now to change that [1], but still the command is mentioned in 'gitsubmodules(7)' as if it does respect that config. Adjust the call in 'gitsubmodules(7)' by calling 'ls-files' with the '--recurse-submodules' option. While at it, uniformize the capitalization in that file, and use backticks instead of quotes for Git commands and configuration variables. [1] https://lore.kernel.org/git/pull.732.git.1599707259907.gitgitgadget@gmail.com/T/#u Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 October 2020, 19:54:07 UTC |
| ab4691b | Junio C Hamano | 04 October 2020, 19:48:44 UTC | Nineteenth batch Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 October 2020, 19:49:15 UTC |
| 26b42b4 | Junio C Hamano | 04 October 2020, 19:49:15 UTC | 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() | 04 October 2020, 19:49:15 UTC |
| 2fa8aac | Junio C Hamano | 04 October 2020, 19:49:14 UTC | 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" | 04 October 2020, 19:49:14 UTC |
| ea1f611 | Junio C Hamano | 04 October 2020, 19:49:13 UTC | Merge branch 'jc/fmt-merge-msg-suppress-destination' Docfix. * jc/fmt-merge-msg-suppress-destination: config/fmt-merge-msg.txt: drop space in quote | 04 October 2020, 19:49:13 UTC |
| d1b7504 | Junio C Hamano | 04 October 2020, 19:49:12 UTC | Merge branch 'tb/upload-pack-filters' Hotfix. * tb/upload-pack-filters: config/uploadpack.txt: fix typo in `--filter=tree:<n>` | 04 October 2020, 19:49:12 UTC |
| 84cdeed | Junio C Hamano | 04 October 2020, 19:49:10 UTC | Merge branch 'jc/sequencer-stopped-sha-simplify' Code simplification. * jc/sequencer-stopped-sha-simplify: sequencer: stop abbreviating stopped-sha file | 04 October 2020, 19:49:11 UTC |
| 741f1f8 | Junio C Hamano | 04 October 2020, 19:49:09 UTC | 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" | 04 October 2020, 19:49:09 UTC |
| 03b0198 | Junio C Hamano | 04 October 2020, 19:49:09 UTC | 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() | 04 October 2020, 19:49:09 UTC |
| 9839cce | Junio C Hamano | 04 October 2020, 19:49:09 UTC | Merge branch 'eg/mailinfo-doc-scissors' The explanation of the "scissors line" has been clarified. * eg/mailinfo-doc-scissors: Doc: show example scissors line | 04 October 2020, 19:49:09 UTC |
| f4cc68c | Junio C Hamano | 04 October 2020, 19:49:08 UTC | 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 | 04 October 2020, 19:49:08 UTC |
| 03a0182 | Junio C Hamano | 04 October 2020, 19:49:08 UTC | 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 | 04 October 2020, 19:49:08 UTC |
| 230ff3e | Junio C Hamano | 04 October 2020, 19:49:07 UTC | 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 | 04 October 2020, 19:49:07 UTC |
| 86cca37 | Junio C Hamano | 04 October 2020, 19:49:06 UTC | 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 | 04 October 2020, 19:49:06 UTC |
| 94de88c | Junio C Hamano | 04 October 2020, 19:49:04 UTC | 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` | 04 October 2020, 19:49:05 UTC |
| 5a25615 | Junio C Hamano | 04 October 2020, 19:49:04 UTC | 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 | 04 October 2020, 19:49:04 UTC |
| 356c473 | Nikita Leonov | 03 October 2020, 13:29:12 UTC | credential: treat CR/LF as line endings in the credential protocol This fix makes using Git credentials more friendly to Windows users: it allows a credential helper to communicate using CR/LF line endings ("DOS line endings" commonly found on Windows) instead of LF-only line endings ("Unix line endings"). Note that this changes the behavior a bit: if a credential helper produces, say, a password with a trailing Carriage Return character, that will now be culled even when the rest of the lines end only in Line Feed characters, indicating that the Carriage Return was not meant to be part of the line ending. In practice, it seems _very_ unlikely that something like this happens. Passwords usually need to consist of non-control characters, URLs need to have special characters URL-encoded, and user names, well, are names. However, it _does_ help on Windows, where CR/LF line endings are common: as unrecognized commands are simply ignored by the credential machinery, even a command like `quit\r` (which is clearly intended to abort) would simply be ignored (silently) by Git. So let's change the credential machinery to accept both CR/LF and LF line endings. While we do this for the credential helper protocol, we do _not_ adjust `git credential-cache--daemon` (which won't work on Windows, anyway, because it requires Unix sockets) nor `git credential-store` (which writes the file `~/.git-credentials` which we consider an implementation detail that should be opaque to the user, read: we do expect users _not_ to edit this file manually). Signed-off-by: Nikita Leonov <nykyta.leonov@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 October 2020, 17:41:03 UTC |
| e2b9cb1 | Junio C Hamano | 03 October 2020, 17:06:27 UTC | 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" | 03 October 2020, 17:06:27 UTC |
| 6cd8049 | Paul Mackerras | 03 October 2020, 05:20:33 UTC | 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> | 03 October 2020, 05:20:33 UTC |
| e244588 | Denton Liu | 11 September 2020, 04:36:33 UTC | 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> | 03 October 2020, 04:55:38 UTC |
| 8791bf1 | Derrick Stolee | 02 October 2020, 14:58:56 UTC | 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> | 02 October 2020, 17:26:31 UTC |
| 7efba5f | Jacob Keller | 01 October 2020, 21:46:53 UTC | 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> | 01 October 2020, 22:22:10 UTC |
