| ea8bbf2 | Matheus Tavares | 05 January 2021, 15:47:39 UTC | t4129: don't fail if setgid is set in the test directory The last test of t4129 creates a directory and expects its setgid bit (g+s) to be off. But this makes the test fail when the parent directory has the bit set, as setgid's state is inherited by newly created subdirectories. One way to solve this problem is to allow the presence of this bit when comparing the return of `test_modebits` with the expected value. But then we may have the same problem in the future when other tests start using `test_modebits` on directories (currently t4129 is the only one) and forget about setgid. Instead, let's make the helper function more robust with respect to the state of the setgid bit in the test directory by removing this bit from the returning value. There should be no problem with existing callers as no one currently expects this bit to be on. Note that the sticky bit (+t) and the setuid bit (u+s) are not inherited, so we don't have to worry about those. Reported-by: Kevin Daudt <me@ikke.info> Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2021, 23:59:17 UTC |
| 08bf6a8 | Ævar Arnfjörð Bjarmason | 06 January 2021, 10:01:36 UTC | branch tests: add to --sort tests Further stress the --sort callback in ref-filter.c. The implementation uses certain short-circuiting logic, let's make sure it behaves the same way on e.g. name & version sort. Improves a test added in aedcb7dc75e (branch.c: use 'ref-filter' APIs, 2015-09-23). I don't think all of this output makes sense, but let's test for the behavior as-is, we can fix bugs in it in a later commit. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2021, 23:16:56 UTC |
| ffdd02a | Ævar Arnfjörð Bjarmason | 06 January 2021, 10:01:35 UTC | branch: change "--local" to "--list" in comment There has never been a "git branch --local", this is just a typo for "--list". Fixes a comment added in 23e714df91c (branch: roll show_detached HEAD into regular ref_list, 2015-09-23). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2021, 23:15:39 UTC |
| e73fe3d | ZheNing Hu | 06 January 2021, 14:44:03 UTC | builtin/*: update usage format According to the guidelines in parse-options.h, we should not end in a full stop or start with a capital letter. Fix old error and usage messages to match this expectation. Signed-off-by: ZheNing Hu <adlternative@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2021, 23:10:49 UTC |
| 4ca7994 | Junio C Hamano | 06 January 2021, 14:44:02 UTC | parse-options: format argh like error messages "Keep it homogeneous across the repository" is in general a guideline that can be used to converge to a good practice, but we can be a bit more prescriptive in this case. Just like the messages we give die(_("...")) are formatted without the final full stop and without the initial capitalization, most of the argument help text are already formatted that way, and we want to encourage that as the house style. Noticed-by: ZheNing Hu <adlternative@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: ZheNing Hu <adlternative@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2021, 23:10:27 UTC |
| 6a8c89d | Martin Ågren | 05 January 2021, 19:23:50 UTC | read-cache: try not to peek into `struct {lock_,temp}file` Similar to the previous commits, try to avoid peeking into the `struct lock_file`. We also have some `struct tempfile`s -- let's avoid looking into those as well. Note that `do_write_index()` takes a tempfile and that when we call it, we either have a tempfile which we can easily hand down, or we have a lock file, from which we need to somehow obtain the internal tempfile. So we need to leave that one instance of peeking-into. Nevertheless, this commit leaves us not relying on exactly how the path of the tempfile / lock file is stored internally. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Reviewed-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2021, 21:53:32 UTC |
| 7f0dc79 | Martin Ågren | 05 January 2021, 19:23:49 UTC | refs/files-backend: don't peek into `struct lock_file` Similar to the previous commits, avoid peeking into the `struct lock_file`. Use the lock file API instead. Note how we obtain the path to the lock file if `fdopen_lock_file()` failed and that this is not a problem: as documented in lockfile.h, failure to "fdopen" does not roll back the lock file and we're free to, e.g., query it for its path. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Reviewed-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2021, 21:53:32 UTC |
| acd7160 | Martin Ågren | 05 January 2021, 19:23:48 UTC | midx: don't peek into `struct lock_file` Similar to the previous commits, avoid peeking into the `struct lock_file`. Use the lock file API instead. The two functions we're calling here double-check that the tempfile is indeed "active", which is arguably overkill considering how we took the lock on the line immediately above. More importantly, this future-proofs us against, e.g., other code appearing between these two lines or the lock file and/or tempfile internals changing. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Reviewed-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2021, 21:53:32 UTC |
| a52cdce | Martin Ågren | 05 January 2021, 19:23:47 UTC | commit-graph: don't peek into `struct lock_file` Similar to the previous commit, avoid peeking into the `struct lock_file`. Use the lock file API instead. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Reviewed-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2021, 21:53:32 UTC |
| d4a4976 | Martin Ågren | 05 January 2021, 19:23:46 UTC | builtin/gc: don't peek into `struct lock_file` A `struct lock_file` is pretty much just a wrapper around a tempfile. But it's easy enough to avoid relying on this. Use the wrappers that the lock file API provides rather than peeking at the temp file or even into *its* internals. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Reviewed-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2021, 21:53:32 UTC |
| cc2d43b | Taylor Blau | 04 January 2021, 21:35:37 UTC | p7519: allow running without watchman prereq p7519 measures the performance of the fsmonitor code. To do this, it uses the installed copy of Watchman. If Watchman isn't installed, a noop integration script is installed in its place. When in the latter mode, it is expected that the script should not write a "last update token": in fact, it doesn't write anything at all since the script is blank. Commit 33226af42b (t/perf/fsmonitor: improve error message if typoing hook name, 2020-10-26) made sure that running 'git update-index --fsmonitor' did not write anything to stderr, but this is not the case when using the empty Watchman script, since Git will complain that: $ which watchman watchman not found $ cat .git/hooks/fsmonitor-empty $ git -c core.fsmonitor=.git/hooks/fsmonitor-empty update-index --fsmonitor warning: Empty last update token. Prior to 33226af42b, the output wasn't checked at all, which allowed this noop mode to work. But, 33226af42b breaks p7519 when running it without a 'watchman(1)' on your system. Handle this by only checking that the stderr is empty only when running with a real watchman executable. Otherwise, assert that the error message is the expected one when running in the noop mode. Signed-off-by: Taylor Blau <me@ttaylorr.com> Acked-by: Nipunn Koorapati <nipunn@dropbox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2021, 21:48:25 UTC |
| ca5120c | René Scharfe | 31 December 2020, 23:55:12 UTC | rebase: verify commit parameter If the user specifies a base commit to switch to, check if it actually references a commit right away to avoid getting confused later on when it turns out to be an invalid object. Reported-by: LeSeulArtichaut <leseulartichaut@gmail.com> Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2021, 23:24:13 UTC |
| 7b77f5a | Martin Ågren | 29 December 2020, 22:43:35 UTC | pack-format.txt: document sizes at start of delta data We document the delta data as a set of instructions, but forget to document the two sizes that precede those instructions: the size of the base object and the size of the object to be reconstructed. Fix this omission. Rather than cramming all the details about the encoding into the running text, introduce a separate section detailing our "size encoding" and refer to it. Reported-by: Ross Light <ross@zombiezen.com> Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2021, 21:00:28 UTC |
| c8302c6 | Antonio Russo | 04 January 2021, 02:30:35 UTC | t6016: move to lib-log-graph.sh framework t6016 manually reconstructs git log --graph output by using the reported commit hashes from `git rev-parse`. Each tag is converted into an environment variable manually, and then `echo`-ed to an expected output file, which is in turn compared to the actual output. The expected output is difficult to read and write, because, e.g., each line of output must be prefaced with echo, quoted, and properly escaped. Additionally, the test is sensitive to trailing whitespace, which may potentially be removed from graph log output in the future. In order to reduce duplication, ease troubleshooting of failed tests by improving readability, and ease the addition of more tests to this file, port the operations to `lib-log-graph.sh`, which is already used in several other tests, e.g., t4215. Give all merges a simple commit message, and use a common `check_graph` macro taking a heredoc of the expected output which does not required extensive escaping. Signed-off-by: Antonio Russo <aerusso@aerusso.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2021, 20:20:49 UTC |
| 04f6b0a | Martin Ågren | 03 January 2021, 09:36:48 UTC | t1300: don't needlessly work with `core.foo` configs We use various made-up config keys in the "core" section for no real reason. Change them to work in the "section" section instead and be careful to also change "cores" to "sections". Make sure to also catch "Core", "CoReS" and similar. There are a few instances that actually want to work with a real "core" config such as `core.bare` or `core.editor`. After this, it's clearer that they work with "core" for a reason. Reported-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2021, 19:31:25 UTC |
| 34479d7 | Martin Ågren | 03 January 2021, 09:36:47 UTC | t1300: remove duplicate test for `--file no-such-file` We test that we can handle `git config --file symlink` and the error case of `git config --file symlink-to-missing-file`. For good measure, we also throw in a test to check that we correctly handle referencing a missing regular file. But we have such a test earlier in this script. They both check that we fail to use `--file no-such-file --list`. Drop the latter of these and keep the one that is in the general area where we test `--file` and `GIT_CONFIG`. The one we're dropping also checks that we can't even get a specific key from the missing file -- let's make sure we check that in the test we keep. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2021, 19:31:25 UTC |
| b832abb | Martin Ågren | 03 January 2021, 09:36:46 UTC | t1300: remove duplicate test for `--file ../foo` We have two tests for checking that we can handle `git config --file ../other-config ...`. One, using `--file`, was introduced in 65807ee697 ("builtin-config: Fix crash when using "-f <relative path>" from non-root dir", 2010-01-26), then another, using `GIT_CONFIG`, came about in 270a34438b ("config: stop using config_exclusive_filename", 2012-02-16). The latter of these was then converted to use `--file` in f7e8714101 ("t: prefer "git config --file" to GIT_CONFIG", 2014-03-20). Both where then simplified in a5db0b77b9 ("t1300: extract and use test_cmp_config()", 2018-10-21). These two tests differ slightly in the order of the options used, but other than that, they are identical. Let's drop one. As noted in f7e8714101, we do still have a test for `GIT_CONFIG` and it shares the implementation with `--file`. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2021, 19:31:24 UTC |
| 1f4e931 | Philippe Blain | 03 January 2021, 17:42:15 UTC | gitmodules.txt: fix 'GIT_WORK_TREE' variable name 'gitmodules.txt' is a guide about the '.gitmodules' file that describes submodule properties, and that file must exist at the root of the repository. This was clarified in e5b5c1d2cf (Document clarification: gitmodules, gitattributes, 2008-08-31). However, that commit mistakenly uses the non-existing environment variable 'GIT_WORK_DIR' to refer to the root of the repository. Fix that by using the correct variable, 'GIT_WORK_TREE'. Take the opportunity to modernize and improve the formatting of that guide, and fix a grammar mistake. Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> Acked-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2021, 19:29:36 UTC |
| 7efc378 | Thomas Ackermann | 03 January 2021, 14:25:50 UTC | doc: fix some typos Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Acked-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2021, 19:27:48 UTC |
| 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 |
| 52fc4f1 | Daniel Levin | 23 December 2020, 14:37:27 UTC | git-p4: fix syncing file types with pattern Example of pattern file type: text+k Text filtered through the p4 pattern regexp must be converted from string back to bytes, otherwise 'data' command for the fast-import will receive extra invalid characters, followed by the fast-import process error. CC: Yang Zhao <yang.zhao@skyboxlabs.com> Signed-off-by: Daniel Levin <dendy.ua@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 December 2020, 21:49:40 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 |
| 33fc562 | Felipe Contreras | 18 December 2020, 15:14:06 UTC | test: bisect-porcelain: fix location of files Commit ba7eafe146 (t6030: explicitly test for bisection cleanup, 2017-09-29) introduced checks for files in the $GIT_DIR directory, but that variable is not always defined, and in this test file it's not. Therefore these checks always passed regardless of the presence of these files (unless the user has some /BISECT_LOG file, for some reason). Let's check the files in the correct location. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2020, 21:08:39 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 |
