| 71ca53e | Junio C Hamano | 27 December 2020, 23:15:23 UTC | Git 2.30 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2020, 23:15:23 UTC |
| f6bf36d | Junio C Hamano | 27 December 2020, 23:14:31 UTC | Merge branch 'pb/doc-git-linkit-fix' Docfix. * pb/doc-git-linkit-fix: git.txt: fix typos in 'linkgit' macro invocation | 27 December 2020, 23:14:32 UTC |
| 371065c | Junio C Hamano | 27 December 2020, 23:01:16 UTC | Merge tag 'l10n-2.30.0-rnd2' of https://github.com/git-l10n/git-po l10n for Git 2.30.0 round 2 * tag 'l10n-2.30.0-rnd2' of https://github.com/git-l10n/git-po: l10n: zh_CN: for git v2.30.0 l10n round 1 and 2 l10n: zh_TW.po: v2.30.0 round 2 (1 untranslated) l10n: pl.po: add translation and set team leader l10n: pl.po: started Polish translation l10n: de.po: Update German translation for Git 2.30.0 l10n: Update Catalan translation l10n: bg.po: Updated Bulgarian translation (5037t) l10n: fr.po v2.30.0 rnd 2 l10n: tr: v2.30.0-r2 l10n: sv.po: Update Swedish translation (5037t0f0u) l10n: vi.po(5037t): v2.30.0 rnd 2 l10n: git.pot: v2.30.0 round 2 (1 new, 2 removed) l10n: Update Catalan translation l10n: fr.po: v2.30.0 rnd 1 l10n: fr.po Fix a typo l10n: fr fix misleading message l10n: tr: v2.30.0-r1 l10n: sv.po: Update Swedish translation (5038t0f0u) l10n: git.pot: v2.30.0 round 1 (70 new, 45 removed) | 27 December 2020, 23:01:16 UTC |
| d13389b | Jiang Xin | 07 December 2020, 00:10:10 UTC | l10n: zh_CN: for git v2.30.0 l10n round 1 and 2 Translate 71 new messages (5037t0f0u) for git 2.30.0. Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 27 December 2020, 11:23:27 UTC |
| ecc0c58 | Jiang Xin | 25 December 2020, 07:12:02 UTC | Merge branch 'l10n/zh_TW/201223' of github.com:l10n-tw/git-po * 'l10n/zh_TW/201223' of github.com:l10n-tw/git-po: l10n: zh_TW.po: v2.30.0 round 2 (1 untranslated) | 25 December 2020, 07:12:02 UTC |
| 6806dd8 | pan93412 | 23 December 2020, 13:52:18 UTC | l10n: zh_TW.po: v2.30.0 round 2 (1 untranslated) Signed-off-by: pan93412 <pan93412@gmail.com> | 25 December 2020, 04:16:13 UTC |
| b77b318 | Arusekk | 02 December 2020, 23:19:58 UTC | l10n: pl.po: add translation and set team leader Signed-off-by: Arusekk <arek_koz@o2.pl> | 23 December 2020, 22:51:43 UTC |
| 4a0de43 | Junio C Hamano | 23 December 2020, 21:57:41 UTC | Git 2.30-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 December 2020, 21:59:46 UTC |
| 7358320 | Junio C Hamano | 23 December 2020, 21:59:46 UTC | Merge branch 'nk/refspecs-negative-fix' Hotfix for recent regression. * nk/refspecs-negative-fix: negative-refspec: improve comment on query_matches_negative_refspec negative-refspec: fix segfault on : refspec | 23 December 2020, 21:59:46 UTC |
| 7a50265 | Junio C Hamano | 23 December 2020, 21:59:46 UTC | Merge branch 'ma/maintenance-crontab-fix' Hotfix for a topic of this cycle. * ma/maintenance-crontab-fix: t7900-maintenance: test for magic markers gc: fix handling of crontab magic markers git-maintenance.txt: add missing word | 23 December 2020, 21:59:46 UTC |
| 04cd999 | Junio C Hamano | 23 December 2020, 21:59:46 UTC | Merge branch 'dl/checkout-p-merge-base' Fix to a regression introduced during this cycle. * dl/checkout-p-merge-base: checkout -p: handle tree arguments correctly again | 23 December 2020, 21:59:46 UTC |
| d076224 | Junio C Hamano | 23 December 2020, 21:59:46 UTC | Merge branch 'js/no-more-prepare-for-main-in-test' Test coverage fix. * js/no-more-prepare-for-main-in-test: tests: drop the `PREPARE_FOR_MAIN_BRANCH` prereq t9902: use `main` as initial branch name t6302: use `main` as initial branch name t5703: use `main` as initial branch name t5510: use `main` as initial branch name t5505: finalize transitioning to using the branch name `main` t3205: finalize transitioning to using the branch name `main` t3203: complete the transition to using the branch name `main` t3201: finalize transitioning to using the branch name `main` t3200: finish transitioning to the initial branch name `main` t1400: use `main` as initial branch name | 23 December 2020, 21:59:46 UTC |
| c46f849 | Junio C Hamano | 23 December 2020, 21:59:46 UTC | Merge branch 'jx/pack-redundant-on-single-pack' "git pack-redandant" when there is only one packfile used to crash, which has been corrected. * jx/pack-redundant-on-single-pack: pack-redundant: fix crash when one packfile in repo | 23 December 2020, 21:59:46 UTC |
| f6d254c | m4sk1n | 16 January 2017, 19:31:10 UTC | l10n: pl.po: started Polish translation Signed-off-by: Arusekk <arek_koz@o2.pl> | 23 December 2020, 21:51:30 UTC |
| 6fe3d27 | Matthias Rüster | 19 December 2020, 12:53:23 UTC | l10n: de.po: Update German translation for Git 2.30.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> | 23 December 2020, 12:41:53 UTC |
| 4953317 | Jiang Xin | 23 December 2020, 00:44:44 UTC | Merge branch 'master' of github.com:Softcatala/git-po * 'master' of github.com:Softcatala/git-po: l10n: Update Catalan translation | 23 December 2020, 00:44:44 UTC |
| 5bed7f6 | Philippe Blain | 22 December 2020, 15:44:42 UTC | git.txt: fix typos in 'linkgit' macro invocation The 'linkgit' Asciidoc macro is misspelled as 'linkit' in the description of 'GIT_SEQUENCE_EDITOR' since the addition of that variable to git(1) in 902a126eca (doc: mention GIT_SEQUENCE_EDITOR and 'sequence.editor' more, 2020-08-31). Also, it uses two colons instead of one. Fix that. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2020, 20:02:29 UTC |
| 9d82565 | Jordi Mas | 22 December 2020, 17:04:53 UTC | l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> | 22 December 2020, 17:04:53 UTC |
| da0e79d | Alexander Shopov | 20 December 2020, 18:00:54 UTC | l10n: bg.po: Updated Bulgarian translation (5037t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 22 December 2020, 16:49:18 UTC |
| 773c694 | Nipunn Koorapati | 22 December 2020, 03:58:17 UTC | negative-refspec: improve comment on query_matches_negative_refspec Comment did not adequately explain how the two loops work together to achieve the goal of querying for matching of any negative refspec. Signed-off-by: Nipunn Koorapati <nipunn@dropbox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2020, 06:49:36 UTC |
| 18f9c98 | Nipunn Koorapati | 22 December 2020, 03:58:16 UTC | negative-refspec: fix segfault on : refspec The logic added to check for negative pathspec match by c0192df630 (refspec: add support for negative refspecs, 2020-09-30) looks at refspec->src assuming it is never NULL, however when remote.origin.push is set to ":", then refspec->src is NULL, causing a segfault within strcmp. Tell git to handle matching refspec by adding the needle to the set of positively matched refspecs, since matching ":" refspecs match anything as src. Add test for matching refspec pushes fetch-negative-refspec both individually and in combination with a negative refspec. Signed-off-by: Nipunn Koorapati <nipunn@dropbox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 December 2020, 06:49:36 UTC |
| 4484042 | Jiang Xin | 22 December 2020, 00:46:17 UTC | Merge branch 'fr_2.30_rnd2' of github.com:jnavila/git * 'fr_2.30_rnd2' of github.com:jnavila/git: l10n: fr.po v2.30.0 rnd 2 | 22 December 2020, 00:46:17 UTC |
| a52df25 | Martin Ågren | 21 December 2020, 21:26:33 UTC | t7900-maintenance: test for magic markers When we insert our "BEGIN" and "END" markers into the cron table, it's so that a Git version from many years into the future would be able to identify this region in the cron table. Let's add a test to make sure that these markers don't ever change. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Acked-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2020, 22:33:09 UTC |
| 66dc0a3 | Martin Ågren | 21 December 2020, 21:26:32 UTC | gc: fix handling of crontab magic markers On `git maintenance start`, we add a few entries to the user's cron table. We wrap our entries using two magic markers, "# BEGIN GIT MAINTENANCE SCHEDULE" and "# END GIT MAINTENANCE SCHEDULE". At a later `git maintenance stop`, we will go through the table and remove these lines. Or rather, we will remove the "BEGIN" marker, the "END" marker and everything between them. Alas, we have a bug in how we detect the "END" marker: we don't. As we loop through all the lines of the crontab, if we are in the "old region", i.e., the region we're aiming to remove, we make an early `continue` and don't get as far as checking for the "END" marker. Thus, once we've seen our "BEGIN", we remove everything until the end of the file. Rewrite the logic for identifying these markers. There are four cases that are mutually exclusive: The current line starts a region or it ends it, or it's firmly within the region, or it's outside of it (and should be printed). Signed-off-by: Martin Ågren <martin.agren@gmail.com> Acked-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2020, 22:33:08 UTC |
| 83fcadd | Martin Ågren | 21 December 2020, 21:26:31 UTC | git-maintenance.txt: add missing word Add a missing "a" before "bunch". Signed-off-by: Martin Ågren <martin.agren@gmail.com> Acked-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2020, 22:33:08 UTC |
| 5c29f19 | Johannes Schindelin | 19 December 2020, 14:55:59 UTC | checkout -p: handle tree arguments correctly again This fixes a segmentation fault. The bug is caused by dereferencing `new_branch_info->commit` when it is `NULL`, which is the case when the tree-ish argument is actually a tree, not a commit-ish. This was introduced in 5602b500c3c (builtin/checkout: fix `git checkout -p HEAD...` bug, 2020-10-07), where we tried to ensure that the special tree-ish `HEAD...` is handled correctly. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2020, 22:06:09 UTC |
| aa13df6 | Jean-Noël Avila | 21 December 2020, 17:53:19 UTC | l10n: fr.po v2.30.0 rnd 2 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> | 21 December 2020, 17:53:19 UTC |
| cc2a21c | Emir Sarı | 21 December 2020, 09:32:52 UTC | l10n: tr: v2.30.0-r2 Signed-off-by: Emir Sarı <bitigchi@me.com> | 21 December 2020, 09:32:52 UTC |
| 035b991 | Peter Krefting | 21 December 2020, 07:10:43 UTC | l10n: sv.po: Update Swedish translation (5037t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 21 December 2020, 07:10:43 UTC |
| 2a48769 | Tran Ngoc Quan | 21 December 2020, 01:45:38 UTC | l10n: vi.po(5037t): v2.30.0 rnd 2 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 21 December 2020, 01:45:38 UTC |
| d0b62a5 | Jiang Xin | 20 December 2020, 23:11:59 UTC | l10n: git.pot: v2.30.0 round 2 (1 new, 2 removed) Generate po/git.pot from v2.30.0-rc1 for git v2.30.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 20 December 2020, 23:11:59 UTC |
| 3104153 | Jiang Xin | 20 December 2020, 23:10:19 UTC | Merge remote-tracking branch 'github/master' into git-po-master * github/master: (42 commits) Git 2.30-rc1 git-gui: use gray background for inactive text widgets Another batch before 2.30-rc1 git-gui: Fix selected text colors Makefile: conditionally include GIT-VERSION-FILE git-gui: fix colored label backgrounds when using themed widgets config.mak.uname: remove old NonStop compatibility settings diff: correct interaction between --exit-code and -I<pattern> t/perf: fix test_export() failure with BSD `sed` style: do not "break" in switch() after "return" compat-util: pretend that stub setitimer() always succeeds strmap: make callers of strmap_remove() to call it in void context doc: mention Python 3.x supports index-format.txt: document v2 format of file system monitor extension docs: multi-pack-index: remove note about future 'verify' work init: provide useful advice about init.defaultBranch get_default_branch_name(): prepare for showing some advice branch -m: allow renaming a yet-unborn branch init: document `init.defaultBranch` better t7900: use --fixed-value in git-maintenance tests ... | 20 December 2020, 23:10:19 UTC |
| da5bf7b | Jordi Mas | 19 December 2020, 22:52:12 UTC | l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> | 19 December 2020, 22:52:12 UTC |
| 6d3ef5b | Junio C Hamano | 18 December 2020, 23:14:30 UTC | Git 2.30-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2020, 23:15:18 UTC |
| 59fcf74 | Junio C Hamano | 18 December 2020, 23:15:18 UTC | Merge branch 'jc/diff-I-status-fix' "git diff -I<pattern> -exit-code" should exit with 0 status when all the changes match the ignored pattern, but it didn't. * jc/diff-I-status-fix: diff: correct interaction between --exit-code and -I<pattern> | 18 December 2020, 23:15:18 UTC |
| d4187bd | Junio C Hamano | 18 December 2020, 23:15:18 UTC | Merge branch 'es/perf-export-fix' Dev-support fix for BSD. * es/perf-export-fix: t/perf: fix test_export() failure with BSD `sed` | 18 December 2020, 23:15:18 UTC |
| 21fa5bb | Junio C Hamano | 18 December 2020, 23:15:18 UTC | Merge branch 'rb/nonstop-config-mak-uname-update' Build update. * rb/nonstop-config-mak-uname-update: config.mak.uname: remove old NonStop compatibility settings | 18 December 2020, 23:15:18 UTC |
| 3517022 | Junio C Hamano | 18 December 2020, 23:15:17 UTC | Merge branch 'ab/unreachable-break' Code clean-up. * ab/unreachable-break: style: do not "break" in switch() after "return" | 18 December 2020, 23:15:18 UTC |
| e0f58c9 | Junio C Hamano | 18 December 2020, 23:15:17 UTC | Merge branch 'jc/strmap-remove-typefix' C-std compliance fix. * jc/strmap-remove-typefix: strmap: make callers of strmap_remove() to call it in void context | 18 December 2020, 23:15:17 UTC |
| ecfc02d | Junio C Hamano | 18 December 2020, 23:15:17 UTC | Merge branch 'jc/compat-util-setitimer-fix' Fix a recent bug in a rarely used replacement code. * jc/compat-util-setitimer-fix: compat-util: pretend that stub setitimer() always succeeds | 18 December 2020, 23:15:17 UTC |
| 263dc03 | Junio C Hamano | 18 December 2020, 23:15:17 UTC | Merge branch 'dd/doc-p4-requirements-update' Doc update. * dd/doc-p4-requirements-update: doc: mention Python 3.x supports | 18 December 2020, 23:15:17 UTC |
| 772bdcd | Junio C Hamano | 18 December 2020, 23:15:17 UTC | Merge branch 'js/init-defaultbranch-advice' Our users are going to be trained to prepare for future change of init.defaultBranch configuration variable. * js/init-defaultbranch-advice: init: provide useful advice about init.defaultBranch get_default_branch_name(): prepare for showing some advice branch -m: allow renaming a yet-unborn branch init: document `init.defaultBranch` better | 18 December 2020, 23:15:17 UTC |
| f4d8e19 | Junio C Hamano | 18 December 2020, 23:07:10 UTC | Merge https://github.com/prati0100/git-gui * https://github.com/prati0100/git-gui: git-gui: use gray background for inactive text widgets git-gui: Fix selected text colors Makefile: conditionally include GIT-VERSION-FILE git-gui: fix colored label backgrounds when using themed widgets git-gui: ssh-askpass: add a checkbox to show the input text git-gui: update Russian translation git-gui: use commit message template git-gui: Only touch GITGUI_MSG when needed | 18 December 2020, 23:07:10 UTC |
| 7b0cfe1 | Pratyush Yadav | 18 December 2020, 19:32:34 UTC | Merge branch 'sh/inactive-background' Set a different background color for selections in inactive widgets. This inactive color is calculated from the current theme colors to make sure it works for all themes. * sh/inactive-background: git-gui: use gray background for inactive text widgets | 18 December 2020, 19:32:34 UTC |
| da4d86d | Stefan Haller | 18 December 2020, 09:43:14 UTC | git-gui: use gray background for inactive text widgets This makes it easier to see at a glance which of the four main views has the keyboard focus. Signed-off-by: Stefan Haller <stefan@haller-berlin.de> Signed-off-by: Pratyush Yadav <me@yadavpratyush.com> | 18 December 2020, 19:30:17 UTC |
| ba2aa15 | Junio C Hamano | 17 December 2020, 23:04:26 UTC | Another batch before 2.30-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2020, 23:06:42 UTC |
| 7bceb83 | Junio C Hamano | 17 December 2020, 23:06:42 UTC | Merge branch 'jh/index-v2-doc-on-fsmn' Doc update. * jh/index-v2-doc-on-fsmn: index-format.txt: document v2 format of file system monitor extension | 17 December 2020, 23:06:42 UTC |
| 94dc98d | Junio C Hamano | 17 December 2020, 23:06:41 UTC | Merge branch 'jb/midx-doc-update' Doc update. * jb/midx-doc-update: docs: multi-pack-index: remove note about future 'verify' work | 17 December 2020, 23:06:41 UTC |
| f0c592d | Junio C Hamano | 17 December 2020, 23:06:40 UTC | Merge branch 'rj/make-clean' Build optimization. * rj/make-clean: Makefile: don't use a versioned temp distribution directory Makefile: don't try to clean old debian build product gitweb/Makefile: conditionally include ../GIT-VERSION-FILE Documentation/Makefile: conditionally include ../GIT-VERSION-FILE Documentation/Makefile: conditionally include doc.dep | 17 December 2020, 23:06:40 UTC |
| 689010c | Junio C Hamano | 17 December 2020, 23:06:40 UTC | Merge branch 'js/t7064-master-to-initial' Test update. * js/t7064-master-to-initial: t7064: avoid relying on a specific default branch name | 17 December 2020, 23:06:40 UTC |
| f4fb219 | Junio C Hamano | 17 December 2020, 23:06:40 UTC | Merge branch 'js/t6300-hardcode-main' Test update. * js/t6300-hardcode-main: t6300: avoid using the default name of the initial branch | 17 December 2020, 23:06:40 UTC |
| e5ace71 | Junio C Hamano | 17 December 2020, 23:06:40 UTC | Merge branch 'jk/oid-array-cleanup' Code clean-up. * jk/oid-array-cleanup: commit-graph: use size_t for array allocation and indexing commit-graph: replace packed_oid_list with oid_array commit-graph: drop count_distinct_commits() function oid-array: provide a for-loop iterator oid-array: make sort function public cache.h: move hash/oid functions to hash.h t0064: make duplicate tests more robust t0064: drop sha1 mention from filename oid-array.h: drop sha1 mention from header guard | 17 December 2020, 23:06:40 UTC |
| 21127fa | Junio C Hamano | 17 December 2020, 23:06:40 UTC | Merge branch 'tb/partial-clone-filters-fix' Fix potential server side resource deallocation issues when responding to a partial clone request. * tb/partial-clone-filters-fix: upload-pack.c: don't free allowed_filters util pointers builtin/clone.c: don't ignore transport_fetch_refs() errors | 17 December 2020, 23:06:40 UTC |
| 9feed4e | Junio C Hamano | 17 December 2020, 23:06:39 UTC | Merge branch 'js/t7900-protect-pwd-in-config-get' Hotfix for test breakage. * js/t7900-protect-pwd-in-config-get: t7900: use --fixed-value in git-maintenance tests | 17 December 2020, 23:06:39 UTC |
| 62aed98 | Pratyush Yadav | 17 December 2020, 20:22:26 UTC | Merge branch 'st/selected-text-colors' Set colors for selected text properly. * st/selected-text-colors: git-gui: Fix selected text colors | 17 December 2020, 20:22:26 UTC |
| 4d22c05 | Serg Tereshchenko | 22 November 2020, 13:32:33 UTC | git-gui: Fix selected text colors Added selected state colors for text widget. Same colors for active and inactive selection, to match previous behaviour. Signed-off-by: Serg Tereshchenko <serg.partizan@gmail.com> Signed-off-by: Pratyush Yadav <me@yadavpratyush.com> | 17 December 2020, 20:19:18 UTC |
| 796f652 | Pratyush Yadav | 17 December 2020, 19:12:14 UTC | Merge branch 'rj/clean-speedup' Speed up 'make clean' on Cygwin. * rj/clean-speedup: Makefile: conditionally include GIT-VERSION-FILE | 17 December 2020, 19:12:14 UTC |
| 5bc8b5d | Ramsay Jones | 07 December 2020, 00:39:30 UTC | Makefile: conditionally include GIT-VERSION-FILE The 'clean' target is noticeably slow on cygwin, even for a 'do-nothing' invocation of 'make clean'. For example, the second 'make clean' given below: $ make clean >/dev/null 2>&1 $ make clean GITGUI_VERSION = 0.21.0.85.g3e5c rm -rf git-gui lib/tclIndex po/*.msg rm -rf GIT-VERSION-FILE GIT-GUI-VARS $ has been timed at 1.934s on my laptop (an old core i5-4200M @ 2.50GHz, 8GB RAM, 1TB HDD). Notice that the Makefile, as part of processing the 'clean' target, is updating the 'GIT-VERSION-FILE' file. This is to ensure that the $(GITGUI_VERSION) make variable is set, once that file had been included. However, the 'clean' target does not use the $(GITGUI_VERSION) variable, so this is wasted effort. In order to eliminate such wasted effort, use the value of the internal $(MAKECMDGOALS) variable to only '-include GIT-VERSION-FILE' when the target is not 'clean'. (This drops the time down to 0.676s, on my laptop, giving an improvement of 65.05%). Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Pratyush Yadav <me@yadavpratyush.com> | 17 December 2020, 19:04:15 UTC |
| 7d6d21f | Pratyush Yadav | 17 December 2020, 19:02:06 UTC | Merge branch 'sh/macos-labels' Fix label background colors on MacOS when ttk is enabled. * sh/macos-labels: git-gui: fix colored label backgrounds when using themed widgets | 17 December 2020, 19:02:06 UTC |
| f9481b1 | Stefan Haller | 22 November 2020, 19:45:37 UTC | git-gui: fix colored label backgrounds when using themed widgets The aqua theme on Mac doesn't support changing the background color for labels and frames [1]. Since the red, green, and yellow backgrounds of the labels for unstaged and staged files and the diff pane are so important design elements of git gui's main window, it's not acceptable for them to have grey backgrounds on Mac. To work around this, simply use non-themed widgets for all labels on Mac. This is not a big problem because labels don't look extremely different between the themed and non-themed versions. There are subtle differences, but they are not as bad as having the wrong background color. [1] https://stackoverflow.com/a/6723911 Signed-off-by: Stefan Haller <stefan@haller-berlin.de> Signed-off-by: Pratyush Yadav <me@yadavpratyush.com> | 17 December 2020, 19:00:37 UTC |
| 731d578 | Randall S. Becker | 16 December 2020, 22:07:52 UTC | config.mak.uname: remove old NonStop compatibility settings The MKDIR_WO_TRAILING_SLASH and NO_SETITIMER options are no longer needed on the NonStop platforms as both are now supported by the oldest supported operating system revision. Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2020, 06:06:53 UTC |
| 0696232 | Jiang Xin | 17 December 2020, 01:57:09 UTC | pack-redundant: fix crash when one packfile in repo Command `git pack-redundant --all` will crash if there is only one packfile in the repository. This is because, if there is only one packfile in local_packs, `cmp_local_packs` will do nothing and will leave `pl->unique_objects` as uninitialized. Also add testcases for repository with no packfile and one packfile in t5323. Reported-by: Daniel C. Klauer <daniel.c.klauer@web.de> Signed-off-by: Jiang Xin <zhiyou.jx@alibaba-inc.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2020, 05:21:06 UTC |
| f17c9da | Johannes Schindelin | 17 December 2020, 01:07:10 UTC | tests: drop the `PREPARE_FOR_MAIN_BRANCH` prereq We no longer use it. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2020, 01:41:41 UTC |
| 0007618 | Johannes Schindelin | 17 December 2020, 01:07:09 UTC | t9902: use `main` as initial branch name In 8164360fc86 (t9902: prepare a test for the upcoming default branch name, 2020-10-23), we started adjusting this test script for the default initial branch name changing to `main`. However, there is no need to wait for that: let's adjust the test script to stop relying on a specific initial branch name by setting it explicitly. This allows us to drop the `PREPARE_FOR_MAIN_BRANCH` prereq from one test case. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2020, 01:41:41 UTC |
| 2dbd00a | Johannes Schindelin | 17 December 2020, 01:07:08 UTC | t6302: use `main` as initial branch name In 66713e84e71 (tests: prepare aligned mentions of the default branch name, 2020-10-23), we started adjusting this test script for the default initial branch name changing to `main`. However, there is no need to wait for that: let's adjust the test script to stop relying on a specific initial branch name by setting it explicitly. This allows us to drop the `PREPARE_FOR_MAIN_BRANCH` prereq from six test cases. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2020, 01:41:41 UTC |
| 72dc172 | Johannes Schindelin | 17 December 2020, 01:07:07 UTC | t5703: use `main` as initial branch name In 97cf8d50b59 (t5703: adjust a test case for the upcoming default branch name, 2020-10-23), we prepared this test script for a world when the default initial branch name would be `main`. However, there is no need to wait for that: let's adjust the test script to stop relying on a specific initial branch name by setting it explicitly. This allows us to drop the `PREPARE_FOR_MAIN_BRANCH` prereq from one test case. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2020, 01:41:41 UTC |
| 83ecf26 | Johannes Schindelin | 17 December 2020, 01:07:06 UTC | t5510: use `main` as initial branch name In 66713e84e71 (tests: prepare aligned mentions of the default branch name, 2020-10-23), we prepared this test script for a time when the default initial branch name would be `main`. However, there is no need to wait for that: let's adjust the test script to stop relying on a specific initial branch name by setting it explicitly. This allows us to drop the `PREPARE_FOR_MAIN_BRANCH` prereq from two test cases. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2020, 01:41:41 UTC |
| 97b9136 | Johannes Schindelin | 17 December 2020, 01:07:05 UTC | t5505: finalize transitioning to using the branch name `main` In 66713e84e71 (tests: prepare aligned mentions of the default branch name, 2020-10-23), we started that transition, trying to prepare for a time when `git init` would use that name for the initial branch. Even if that time has not arrived, we can complete the transition by making the test script independent of the default branch name. This also allows us to drop the `PREPARE_FOR_MAIN_BRANCH` prereq from four test cases. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2020, 01:41:41 UTC |
| 654bd7e | Johannes Schindelin | 17 December 2020, 01:07:04 UTC | t3205: finalize transitioning to using the branch name `main` In 66713e84e71 (tests: prepare aligned mentions of the default branch name, 2020-10-23), we started that transition, trying to prepare for a time when `git init` would use that name for the initial branch. Even if that time has not arrived, we can complete the transition by making the test script independent of the default branch name. This also allows us to drop the `PREPARE_FOR_MAIN_BRANCH` prereq from one test case. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2020, 01:41:41 UTC |
| 1eee0a4 | Johannes Schindelin | 17 December 2020, 01:07:03 UTC | t3203: complete the transition to using the branch name `main` In 66713e84e71 (tests: prepare aligned mentions of the default branch name, 2020-10-23), we started that transition, trying to prepare for a time when `git init` would use that name for the initial branch. Even if that time has not arrived, we can complete the transition by making the test script independent of the default branch name. This also allows us to drop the `PREPARE_FOR_MAIN_BRANCH` prereq from one test case. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2020, 01:41:41 UTC |
| 94287e7 | Johannes Schindelin | 17 December 2020, 01:07:02 UTC | t3201: finalize transitioning to using the branch name `main` In 66713e84e71 (tests: prepare aligned mentions of the default branch name, 2020-10-23), we started that transition, trying to prepare for a time when `git init` would use that name for the initial branch. Even if that time has not arrived, we can complete the transition by making the test script independent of the default branch name. This also allows us to drop the `PREPARE_FOR_MAIN_BRANCH` prereq from one test case. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2020, 01:41:40 UTC |
| ec9779b | Johannes Schindelin | 17 December 2020, 01:07:01 UTC | t3200: finish transitioning to the initial branch name `main` In 56300ff356b (t3200: prepare for `main` being shorter than `master`, 2020-10-23) and in 66713e84e71 (tests: prepare aligned mentions of the default branch name, 2020-10-23), we started to prepare t3200 for a new world where `git init` uses the branch name `main` for the initial branch. We do not even have to wait for that new world: we can easily ensure that that branch name is used, independent of the exact name `git init` will give the initial branch, so let's do that. This also lets us remove the `PREPARE_FOR_MAIN_BRANCH` prereq from three test cases in that script. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2020, 01:41:40 UTC |
| 35a16db | Johannes Schindelin | 17 December 2020, 01:07:00 UTC | t1400: use `main` as initial branch name In 3224b0f0bb7 (t1400: prepare for `main` being default branch name, 2020-10-23), we prepared t1400 for a time when the default initial branch name would be `main`. However, there is no need to wait that long: let's adjust the test script to stop relying on a specific initial branch name by setting it explicitly. This allows us to drop the `PREPARE_FOR_MAIN_BRANCH` prereq from two test cases. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2020, 01:41:40 UTC |
| 50f0439 | Junio C Hamano | 17 December 2020, 01:27:13 UTC | diff: correct interaction between --exit-code and -I<pattern> Just like "git diff -w --exit-code" should exit with 0 when ignoring whitespace differences results in no changes shown, if ignoring certain changes with "git diff -I<pattern> --exit-code" result in an empty patch, we should exit with 0. The test suite did not cover the interaction between "--exit-code" and "-w"; add one while adding a new test for "--exit-code" + "-I". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2020, 01:33:26 UTC |
| 7715c38 | Jiang Xin | 17 December 2020, 00:41:27 UTC | Merge branch 'fr_next' of github.com:jnavila/git into git-po-master * 'fr_next' of github.com:jnavila/git: l10n: fr.po: v2.30.0 rnd 1 l10n: fr.po Fix a typo l10n: fr fix misleading message | 17 December 2020, 00:41:27 UTC |
| 763d202 | Jiang Xin | 17 December 2020, 00:39:48 UTC | Merge branch '2.30-rc1' of github.com:bitigchi/git-po * '2.30-rc1' of github.com:bitigchi/git-po: l10n: tr: v2.30.0-r1 | 17 December 2020, 00:39:48 UTC |
| 02cc663 | Jean-Noël Avila | 16 December 2020, 21:26:55 UTC | l10n: fr.po: v2.30.0 rnd 1 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> | 16 December 2020, 21:26:55 UTC |
| 5e38c80 | Baptiste Fontaine | 27 October 2020, 12:06:12 UTC | l10n: fr.po Fix a typo Signed-off-by: Baptiste Fontaine <b@ptistefontaine.fr> | 16 December 2020, 20:30:52 UTC |
| af60d95 | Jean-Noël Avila | 27 October 2020, 21:01:24 UTC | l10n: fr fix misleading message Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Reported-by: Sami Boukortt <sami@boukortt.com> | 16 December 2020, 20:30:52 UTC |
| f469873 | Eric Sunshine | 16 December 2020, 07:39:07 UTC | t/perf: fix test_export() failure with BSD `sed` test_perf() runs each test in its own subshell which makes it difficult to persist variables between tests. test_export() addresses this shortcoming by grabbing the values of specified variables after a test runs but before the subshell exits, and writes those values to a file which is loaded into the environment of subsequent tests. To grab the values to be persisted, test_export() pipes the output of the shell's builtin `set` command through `sed` which plucks them out using a regular expression along the lines of `s/^(var1|var2)/.../p`. Unfortunately, though, this use of alternation is not portable. For instance, BSD-lineage `sed` (including macOS `sed`) does not support it in the default "basic regular expression" mode (BRE). It may be possible to enable "extended regular expression" mode (ERE) in some cases with `sed -E`, however, `-E` is neither portable nor part of POSIX. Fortunately, alternation is unnecessary in this case and can easily be avoided, so replace it with a series of simple expressions such as `s/^var1/.../p;s/^var2/.../p`. While at it, tighten the expressions so they match the variable names exactly rather than matching prefixes (i.e. use `s/^var1=/.../p`). If the requirements of test_export() become more complex in the future, then an alternative would be to replace `sed` with `perl` which supports alternation on all platforms, however, the simple elimination of alternation via multiple `sed` expressions suffices for the present. Reported-by: Sangeeta <sangunb09@gmail.com> Diagnosed-by: Philippe Blain <levraiphilippeblain@gmail.com> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2020, 19:00:29 UTC |
| 9a161f8 | Emir Sarı | 16 December 2020, 12:31:50 UTC | l10n: tr: v2.30.0-r1 Signed-off-by: Emir Sarı <bitigchi@me.com> | 16 December 2020, 12:31:50 UTC |
| 56f56ac | Ævar Arnfjörð Bjarmason | 15 December 2020, 23:50:27 UTC | style: do not "break" in switch() after "return" Remove this unreachable code. It was found by SunCC, it's found by a non-fatal warning emitted by SunCC. It's one of the things it's more vehement about than GCC & Clang. It complains about a lot of other similarly unreachable code, e.g. a BUG(...) without a "return", and a "return 0" after a long if/else, both of whom have "return" statements. Those are also genuine redundancies to a compiler, but arguably make the code a bit easier to read & less fragile to maintain. These return/break cases are just unnecessary however, and as seen here the surrounding code just did a plain "return" without a "break" already. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2020, 00:32:50 UTC |
| 14639a4 | Junio C Hamano | 15 December 2020, 21:26:17 UTC | compat-util: pretend that stub setitimer() always succeeds When 15b52a44 (compat-util: type-check parameters of no-op replacement functions, 2020-08-06) turned a handful of no-op C-preprocessor macros into static inline functions to give the callers a better type checking for their parameters, it forgot to return anything from the stubbed out setitimer() function, even though the function was defined to return an int just like the real thing. Since the original C-preprocessor macro implementation was to just turn the call to the function an empty statement, we know that the existing callers do not check the return value from it, and it does not matter what value we return. But it is safer to pretend that the call succeeded by returning 0 than making it fail by returning -1 and clobbering errno with some value. Reported-by: Randall S. Becker <rsbecker@nexbridge.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2020, 23:31:10 UTC |
| 37e7323 | Junio C Hamano | 15 December 2020, 21:25:36 UTC | strmap: make callers of strmap_remove() to call it in void context Two "static inline" functions, both of which return void, call strmap_remove() and tries to return the value it returns as their return value, which is just bogus, as strmap_remove() returns void itself. Call it in the void context and fall-thru the control to the end instead. Reported-by: Randall S. Becker <rsbecker@nexbridge.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2020, 23:30:44 UTC |
| bafe27c | Peter Krefting | 15 December 2020, 20:42:13 UTC | l10n: sv.po: Update Swedish translation (5038t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 15 December 2020, 20:42:13 UTC |
| 0c32704 | Jiang Xin | 15 December 2020, 08:27:56 UTC | l10n: git.pot: v2.30.0 round 1 (70 new, 45 removed) Generate po/git.pot from v2.30.0-rc0 for git v2.30.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 15 December 2020, 08:27:56 UTC |
| fcedbc1 | Đoàn Trần Công Danh | 10 December 2020, 14:30:17 UTC | doc: mention Python 3.x supports Commit 0b4396f068, (git-p4: make python2.7 the oldest supported version, 2019-12-13) pointed out that git-p4 uses Python 2.7-or-later features in the code. In addition, git-p4 gained enough support for Python 3 from 6cec21a82f, (git-p4: encode/decode communication with p4 for python3, 2019-12-13). Let's update our documentation to reflect that fact. Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2020, 23:01:03 UTC |
| 1c52ecf | Junio C Hamano | 14 December 2020, 18:30:05 UTC | Git 2.30-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2020, 18:30:05 UTC |
| 3fc7fc1 | Junio C Hamano | 14 December 2020, 18:21:38 UTC | Merge branch 'js/t5526-with-no-particular-primary-branch-name' Test update. * js/t5526-with-no-particular-primary-branch-name: t5526: drop the prereq expecting the default branch name `main` t5526: avoid depending on a specific default branch name | 14 December 2020, 18:21:38 UTC |
| 043bfc6 | Junio C Hamano | 14 December 2020, 18:21:38 UTC | Merge branch 'js/cmake-extra-built-ins-fix' VSbuild fix. * js/cmake-extra-built-ins-fix: cmake: determine list of extra built-ins dynamically | 14 December 2020, 18:21:38 UTC |
| ccbde2c | Junio C Hamano | 14 December 2020, 18:21:38 UTC | Merge branch 'da/vs-build-iconv-fix' Build update. * da/vs-build-iconv-fix: ci(vs-build): stop passing the iconv library location explicitly | 14 December 2020, 18:21:38 UTC |
| 3c9f0df | Junio C Hamano | 14 December 2020, 18:21:38 UTC | Merge branch 'jk/multi-line-indent-style-fix' Style fix. * jk/multi-line-indent-style-fix: style: indent multiline "if" conditions to align | 14 December 2020, 18:21:38 UTC |
| a5e74b4 | Junio C Hamano | 14 December 2020, 18:21:37 UTC | Merge branch 'jk/check-config-parsing-error-in-upload-pack' Tighten error checking in the codepath that responds to "git fetch". * jk/check-config-parsing-error-in-upload-pack: upload-pack: propagate return value from object filter config callback | 14 December 2020, 18:21:37 UTC |
| aa35dad | Junio C Hamano | 14 December 2020, 18:21:37 UTC | Merge branch 'ae/doc-reproducible-html' Newer versions of xsltproc can assign IDs in HTML documents it generates in a consistent manner. Use the feature to help format HTML version of the user manual reproducibly. * ae/doc-reproducible-html: doc: make HTML manual reproducible | 14 December 2020, 18:21:37 UTC |
| c9f1f44 | Junio C Hamano | 14 December 2020, 18:21:36 UTC | Merge branch 'so/glossary-branch-is-not-necessarily-active' The glossary described a branch as an "active" line of development, which is misleading---a stale and non-moving branch is still a branch. * so/glossary-branch-is-not-necessarily-active: glossary: improve "branch" definition | 14 December 2020, 18:21:37 UTC |
| c59b73b | Junio C Hamano | 14 December 2020, 18:21:36 UTC | Merge branch 'fc/atmark-in-refspec' "@" sometimes worked (e.g. "git push origin @:there") as a part of a refspec element, but "git push origin @" did not work, which has been corrected. * fc/atmark-in-refspec: refspec: make @ a synonym of HEAD tests: push: trivial cleanup tests: push: improve cleanup of HEAD tests | 14 December 2020, 18:21:36 UTC |
| 78abcff | Junio C Hamano | 14 December 2020, 18:21:36 UTC | Merge branch 'dd/help-autocorrect-never' "git $cmd $args", when $cmd is not a recognised subcommand, by default tries to see if $cmd is a typo of an existing subcommand and optionally executes the corrected command if there is only one possibility, depending on the setting of help.autocorrect; the users can now disable the whole thing, including the cycles spent to find a likely typo, by setting the configuration variable to 'never'. * dd/help-autocorrect-never: help.c: help.autocorrect=never means "do not compute suggestions" | 14 December 2020, 18:21:36 UTC |
| 5885367 | Jeff Hostetler | 14 December 2020, 13:33:42 UTC | index-format.txt: document v2 format of file system monitor extension Update the documentation of the file system monitor extension to describe version 2. The format was extended to support opaque tokens in: 56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2020, 16:42:23 UTC |
| 633eebe | Johannes Berg | 13 December 2020, 10:13:40 UTC | docs: multi-pack-index: remove note about future 'verify' work This was implemented in the 'git multi-pack-index' command and merged in 468b3221 (Merge branch 'ds/multi-pack-verify', 2018-10-10). And there's no 'git midx' command. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Reviewed-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2020, 16:39:08 UTC |
| 675704c | Johannes Schindelin | 11 December 2020, 11:36:57 UTC | init: provide useful advice about init.defaultBranch To give ample warning for users wishing to override Git's the fall-back for an unconfigured `init.defaultBranch` (in case we decide to change it in a future Git version), let's introduce some advice that is shown upon `git init` when that value is not set. Note: two test cases in Git's test suite want to verify that the `stderr` output of `git init` is empty. It is now necessary to suppress the advice, we now do that via the `init.defaultBranch` setting. While not strictly necessary, we also set this to `false` in `test_create_repo()`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2020, 23:53:51 UTC |
