| 274b9cc | Junio C Hamano | 22 March 2020, 23:50:46 UTC | Git 2.26 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 March 2020, 23:50:46 UTC |
| 55a7568 | Junio C Hamano | 21 March 2020, 20:48:54 UTC | Merge branch 'en/rebase-backend' Test fix. * en/rebase-backend: t3419: prevent failure when run with EXPENSIVE | 21 March 2020, 20:48:54 UTC |
| c452dfa | Junio C Hamano | 21 March 2020, 19:12:28 UTC | Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git l10n-2.26.0-rnd2.1 * tag 'l10n-2.26.0-rnd2.1' of https://github.com/git-l10n/git-po: (28 commits) l10n: tr.po: change file mode to 644 l10n: de.po: Update German translation for Git 2.26.0 l10n: de.po: add missing space l10n: tr: Fix a couple of ambiguities l10n: Update Catalan translation l10n: sv.po: Update Swedish translation (4839t0f0u) l10n: zh_CN: Revise v2.26.0 translation l10n: zh_CN: for git v2.26.0 l10n round 1 and 2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0 l10n: vi: fix translation + grammar l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated) l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated) l10n: it.po: update the Italian translation for Git 2.26.0 round 2 l10n: es: 2.26.0 round#2 l10n: bg.po: Updated Bulgarian translation (4839t) l10n: tr: v2.26.0 round 2 l10n: fr : v2.26.0 rnd 2 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed) l10n: tr: Add glossary for Turkish translations l10n: sv.po: Update Swedish translation (4835t0f0u) ... | 21 March 2020, 19:12:28 UTC |
| 1557364 | Jiang Xin | 21 March 2020, 10:26:56 UTC | l10n: tr.po: change file mode to 644 Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 21 March 2020, 10:26:56 UTC |
| 2da1b05 | brian m. carlson | 20 March 2020, 21:52:41 UTC | t3419: prevent failure when run with EXPENSIVE This test runs a function which itself runs several assertions. The last of these assertions cleans up the .git/rebase-apply directory, since when run with EXPENSIVE set, the function is invoked a second time to run the same tests with a larger data set. However, as of 2ac0d6273f ("rebase: change the default backend from "am" to "merge"", 2020-02-15), the default backend of rebase has changed, and cleaning up the rebase-apply directory has no effect: it no longer exists, since we're using rebase-merge instead. Since we don't really care which rebase backend is in use, let's just use the command "git rebase --quit", which will do the right thing regardless. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 March 2020, 22:25:24 UTC |
| 1ae3a38 | Matthias Rüster | 14 March 2020, 21:10:16 UTC | l10n: de.po: Update German translation for Git 2.26.0 Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com> Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com> Reviewed-by: Phillip Szelat <phillip.szelat@gmail.com> | 20 March 2020, 11:19:22 UTC |
| 5804c6e | Ralf Thielow | 21 January 2020, 16:30:48 UTC | l10n: de.po: add missing space Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 20 March 2020, 09:45:37 UTC |
| 98cedd0 | Junio C Hamano | 19 March 2020, 23:06:51 UTC | Merge https://github.com/prati0100/git-gui * 'master' of https://github.com/prati0100/git-gui: git-gui: create a new namespace for chord script evaluation git-gui: reduce Tcl version requirement from 8.6 to 8.5 git-gui--askpass: coerce answers to UTF-8 on Windows git-gui: fix error popup when doing blame -> "Show History Context" git-gui: add missing close bracket git-gui: update German translation git-gui: extend translation glossary template with more terms git-gui: update pot template and German translation to current source code | 19 March 2020, 23:06:51 UTC |
| 4914ba4 | Emir Sarı | 19 March 2020, 22:36:24 UTC | l10n: tr: Fix a couple of ambiguities Signed-off-by: Emir Sarı <bitigchi@me.com> | 19 March 2020, 22:36:24 UTC |
| a572802 | Pratyush Yadav | 19 March 2020, 15:59:19 UTC | Merge branch 'py/remove-tcloo' Reduce the Tcl version requirement to 8.5 to allow git-gui to run on MacOS distributions like High Sierra. While here, fix a potential variable name collision. * py/remove-tcloo: git-gui: create a new namespace for chord script evaluation git-gui: reduce Tcl version requirement from 8.6 to 8.5 | 19 March 2020, 15:59:19 UTC |
| 7fcb965 | Elijah Newren | 18 March 2020, 21:18:26 UTC | RelNotes/2.26.0: fix various typos Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 March 2020, 22:42:37 UTC |
| f0c03bc | Jordi Mas | 18 March 2020, 19:24:20 UTC | l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> | 18 March 2020, 19:24:20 UTC |
| be8661a | Junio C Hamano | 17 March 2020, 22:16:14 UTC | Sync with Git 2.25.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 March 2020, 22:27:15 UTC |
| 0822e66 | Junio C Hamano | 17 March 2020, 21:54:02 UTC | Git 2.25.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 March 2020, 22:06:37 UTC |
| 65588b0 | Beat Bolli | 17 March 2020, 15:36:05 UTC | unicode: update the width tables to Unicode 13.0 Now that Unicode 13.0 has been announced[0], update the character width tables to the new version. [0] https://home.unicode.org/announcing-the-unicode-standard-version-13-0/ Signed-off-by: Beat Bolli <dev+git@drbeat.li> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 March 2020, 22:06:37 UTC |
| 7be274b | Junio C Hamano | 17 March 2020, 22:02:26 UTC | Merge branch 'js/ci-windows-update' into maint Updates to the CI settings. * js/ci-windows-update: Azure Pipeline: switch to the latest agent pools ci: prevent `perforce` from being quarantined t/lib-httpd: avoid using macOS' sed | 17 March 2020, 22:02:26 UTC |
| 9a75ecd | Junio C Hamano | 17 March 2020, 22:02:26 UTC | Merge branch 'jk/run-command-formatfix' into maint Code style cleanup. * jk/run-command-formatfix: run-command.h: fix mis-indented struct member | 17 March 2020, 22:02:26 UTC |
| 221887a | Junio C Hamano | 17 March 2020, 22:02:26 UTC | Merge branch 'jk/doc-credential-helper' into maint Docfix. * jk/doc-credential-helper: doc: move credential helper info into gitcredentials(7) | 17 March 2020, 22:02:26 UTC |
| 32fc2c6 | Junio C Hamano | 17 March 2020, 22:02:25 UTC | Merge branch 'js/mingw-open-in-gdb' into maint Dev support. * js/mingw-open-in-gdb: mingw: add a helper function to attach GDB to the current process | 17 March 2020, 22:02:25 UTC |
| fe0d2c8 | Junio C Hamano | 17 March 2020, 22:02:25 UTC | Merge branch 'js/test-unc-fetch' into maint Test updates. * js/test-unc-fetch: t5580: test cloning without file://, test fetching via UNC paths | 17 March 2020, 22:02:25 UTC |
| 618db36 | Junio C Hamano | 17 March 2020, 22:02:25 UTC | Merge branch 'js/test-write-junit-xml-fix' into maint Testfix. * js/test-write-junit-xml-fix: tests: fix --write-junit-xml with subshells | 17 March 2020, 22:02:25 UTC |
| 50e1b41 | Junio C Hamano | 17 March 2020, 22:02:25 UTC | Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint Code simplification. * en/simplify-check-updates-in-unpack-trees: unpack-trees: exit check_updates() early if updates are not wanted | 17 March 2020, 22:02:25 UTC |
| fda2baf | Junio C Hamano | 17 March 2020, 22:02:24 UTC | Merge branch 'jc/doc-single-h-is-for-help' into maint Both "git ls-remote -h" and "git grep -h" give short usage help, like any other Git subcommand, but it is not unreasonable to expect that the former would behave the same as "git ls-remote --head" (there is no other sensible behaviour for the latter). The documentation has been updated in an attempt to clarify this. * jc/doc-single-h-is-for-help: Documentation: clarify that `-h` alone stands for `help` | 17 March 2020, 22:02:24 UTC |
| 41d910e | Junio C Hamano | 17 March 2020, 22:02:24 UTC | Merge branch 'hd/show-one-mergetag-fix' into maint "git show" and others gave an object name in raw format in its error output, which has been corrected to give it in hex. * hd/show-one-mergetag-fix: show_one_mergetag: print non-parent in hex form. | 17 March 2020, 22:02:24 UTC |
| 2d7247a | Junio C Hamano | 17 March 2020, 22:02:23 UTC | Merge branch 'am/mingw-poll-fix' into maint MinGW's poll() emulation has been improved. * am/mingw-poll-fix: mingw: workaround for hangs when sending STDIN | 17 March 2020, 22:02:24 UTC |
| 4e730fc | Junio C Hamano | 17 March 2020, 22:02:23 UTC | Merge branch 'hi/gpg-use-check-signature' into maint "git merge signed-tag" while lacking the public key started to say "No signature", which was utterly wrong. This regression has been reverted. * hi/gpg-use-check-signature: Revert "gpg-interface: prefer check_signature() for GPG verification" | 17 March 2020, 22:02:23 UTC |
| 76ccbda | Junio C Hamano | 17 March 2020, 22:02:23 UTC | Merge branch 'ds/partial-clone-fixes' into maint Fix for a bug revealed by a recent change to make the protocol v2 the default. * ds/partial-clone-fixes: partial-clone: avoid fetching when looking for objects partial-clone: demonstrate bugs in partial fetch | 17 March 2020, 22:02:23 UTC |
| 569b898 | Junio C Hamano | 17 March 2020, 22:02:23 UTC | Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint The merge-recursive machinery failed to refresh the cache entry for a merge result in a couple of places, resulting in an unnecessary merge failure, which has been fixed. * en/t3433-rebase-stat-dirty-failure: merge-recursive: fix the refresh logic in update_file_flags t3433: new rebase testcase documenting a stat-dirty-like failure | 17 March 2020, 22:02:23 UTC |
| 16a4bf1 | Junio C Hamano | 17 March 2020, 22:02:23 UTC | Merge branch 'en/check-ignore' into maint "git check-ignore" did not work when the given path is explicitly marked as not ignored with a negative entry in the .gitignore file. * en/check-ignore: check-ignore: fix documentation and implementation to match | 17 March 2020, 22:02:23 UTC |
| 3246495 | Junio C Hamano | 17 March 2020, 22:02:22 UTC | Merge branch 'jk/push-option-doc-markup-fix' into maint Doc markup fix. * jk/push-option-doc-markup-fix: doc/config/push: use longer "--" line for preformatted example | 17 March 2020, 22:02:22 UTC |
| 56f97d5 | Junio C Hamano | 17 March 2020, 22:02:22 UTC | Merge branch 'jk/doc-diff-parallel' into maint Update to doc-diff. * jk/doc-diff-parallel: doc-diff: use single-colon rule in rendering Makefile | 17 March 2020, 22:02:22 UTC |
| 1a4abcb | Junio C Hamano | 17 March 2020, 22:02:22 UTC | Merge branch 'jh/notes-fanout-fix' into maint The code to automatically shrink the fan-out in the notes tree had an off-by-one bug, which has been killed. * jh/notes-fanout-fix: notes.c: fix off-by-one error when decreasing notes fanout t3305: check notes fanout more carefully and robustly | 17 March 2020, 22:02:22 UTC |
| 7e84f46 | Junio C Hamano | 17 March 2020, 22:02:21 UTC | Merge branch 'jk/index-pack-dupfix' into maint The index-pack code now diagnoses a bad input packstream that records the same object twice when it is used as delta base; the code used to declare a software bug when encountering such an input, but it is an input error. * jk/index-pack-dupfix: index-pack: downgrade twice-resolved REF_DELTA to die() | 17 March 2020, 22:02:22 UTC |
| fa24bbe | Junio C Hamano | 17 March 2020, 22:02:21 UTC | Merge branch 'js/rebase-i-with-colliding-hash' into maint "git rebase -i" identifies existing commits in its todo file with their abbreviated object name, which could become ambigous as it goes to create new commits, and has a mechanism to avoid ambiguity in the main part of its execution. A few other cases however were not covered by the protection against ambiguity, which has been corrected. * js/rebase-i-with-colliding-hash: rebase -i: also avoid SHA-1 collisions with missingCommitsCheck rebase -i: re-fix short SHA-1 collision parse_insn_line(): improve error message when parsing failed | 17 March 2020, 22:02:21 UTC |
| a7a2e12 | Junio C Hamano | 17 March 2020, 22:02:21 UTC | Merge branch 'jk/clang-sanitizer-fixes' into maint C pedantry ;-) fix. * jk/clang-sanitizer-fixes: obstack: avoid computing offsets from NULL pointer xdiff: avoid computing non-zero offset from NULL pointer avoid computing zero offsets from NULL pointer merge-recursive: use subtraction to flip stage merge-recursive: silence -Wxor-used-as-pow warning | 17 March 2020, 22:02:21 UTC |
| 93d0892 | Junio C Hamano | 17 March 2020, 22:02:21 UTC | Merge branch 'dt/submodule-rm-with-stale-cache' into maint Running "git rm" on a submodule failed unnecessarily when .gitmodules is only cache-dirty, which has been corrected. * dt/submodule-rm-with-stale-cache: git rm submodule: succeed if .gitmodules index stat info is zero | 17 March 2020, 22:02:21 UTC |
| dae4777 | Junio C Hamano | 17 March 2020, 22:02:21 UTC | Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint The "--recurse-submodules" option of various subcommands did not work well when run in an alternate worktree, which has been corrected. * pb/recurse-submodule-in-worktree-fix: submodule.c: use get_git_dir() instead of get_git_common_dir() t2405: clarify test descriptions and simplify test t2405: use git -C and test_commit -C instead of subshells t7410: rename to t2405-worktree-submodule.sh | 17 March 2020, 22:02:21 UTC |
| 758d077 | Junio C Hamano | 17 March 2020, 22:02:20 UTC | Merge branch 'es/outside-repo-errmsg-hints' into maint An earlier update to show the location of working tree in the error message did not consider the possibility that a git command may be run in a bare repository, which has been corrected. * es/outside-repo-errmsg-hints: prefix_path: show gitdir if worktree unavailable prefix_path: show gitdir when arg is outside repo | 17 March 2020, 22:02:20 UTC |
| f0c344c | Junio C Hamano | 17 March 2020, 22:02:20 UTC | Merge branch 'js/builtin-add-i-cmds' into maint Minor bugfixes to "git add -i" that has recently been rewritten in C. * js/builtin-add-i-cmds: built-in add -i: accept open-ended ranges again built-in add -i: do not try to `patch`/`diff` an empty list of files | 17 March 2020, 22:02:20 UTC |
| d7d8b20 | Peter Krefting | 17 March 2020, 17:33:22 UTC | l10n: sv.po: Update Swedish translation (4839t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 17 March 2020, 17:33:22 UTC |
| 3891a84 | Pratyush Yadav | 14 March 2020, 21:38:36 UTC | git-gui: create a new namespace for chord script evaluation Evaluating the script in the same namespace as the chord itself creates potential for variable name collision. And in that case the script would unknowingly use the chord's variables. For example, say the script has a variable called 'is_completed', which also exists in the chord's namespace. The script then calls 'eval' and sets 'is_completed' to 1 thinking it is setting its own variable, completely unaware of how the chord works behind the scenes. This leads to the chord never actually executing because it sees 'is_completed' as true and thinks it has already completed. Avoid the potential collision by creating a separate namespace for the script that is a child of the chord's namespace. Signed-off-by: Pratyush Yadav <me@yadavpratyush.com> | 17 March 2020, 13:18:54 UTC |
| 8a8efbe | Pratyush Yadav | 17 February 2020, 15:39:29 UTC | git-gui: reduce Tcl version requirement from 8.6 to 8.5 On some MacOS distributions like High Sierra, Tcl 8.5 is shipped by default. This makes git-gui error out at startup because of the version mismatch. The only part that requires Tcl 8.6 is SimpleChord, which depends on TclOO. So, don't use it and use our homegrown class.tcl instead. This means some slight syntax changes. Since class.tcl doesn't have an "unknown" method like TclOO does, we can't just call '$note', but have to use '$note activate' instead. The constructor now needs a proper namespace qualifier. Update the documentation to reflect the new syntax. As of now, the only part of git-gui that needs Tcl 8.5 is a call to 'apply' in lib/index.tcl::lambda. Keep using it until someone shows up shouting that their OS ships with 8.4 only. Then we would have to look into implementing it in pure Tcl. Signed-off-by: Pratyush Yadav <me@yadavpratyush.com> | 17 March 2020, 13:18:54 UTC |
| 440e744 | Fangyi Zhou | 11 March 2020, 11:55:43 UTC | l10n: zh_CN: Revise v2.26.0 translation Signed-off-by: Fangyi Zhou <me@fangyi.io> Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 17 March 2020, 06:05:22 UTC |
| 2b472aa | Jiang Xin | 30 December 2019, 00:56:49 UTC | l10n: zh_CN: for git v2.26.0 l10n round 1 and 2 Translate 79 new messages (4839t0f0u) for git 2.26.0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 17 March 2020, 06:05:22 UTC |
| 6c85aac | Junio C Hamano | 16 March 2020, 19:46:32 UTC | Git 2.26-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2020, 19:46:32 UTC |
| 74f172e | Junio C Hamano | 16 March 2020, 19:43:30 UTC | Merge branch 'en/test-cleanup' Test fixes. * en/test-cleanup: t6022, t6046: fix flaky files-are-updated checks | 16 March 2020, 19:43:30 UTC |
| e96327c | Junio C Hamano | 16 March 2020, 19:43:29 UTC | Merge branch 'es/outside-repo-errmsg-hints' An earlier update to show the location of working tree in the error message did not consider the possibility that a git command may be run in a bare repository, which has been corrected. * es/outside-repo-errmsg-hints: prefix_path: show gitdir if worktree unavailable | 16 March 2020, 19:43:29 UTC |
| ee94b97 | Tran Ngoc Quan | 16 March 2020, 01:55:40 UTC | l10n: vi(4839t): Updated Vietnamese translation for v2.26.0 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 16 March 2020, 07:21:58 UTC |
| 15fa8d9 | Đoàn Trần Công Danh | 13 January 2020, 15:48:39 UTC | l10n: vi: fix translation + grammar - context should be translated to ngữ cảnh instead of nội dung - add missing accents - switch adjective and secondary objects position: * The formatted English text will be "To remove '+/-' lines", it should be translated to "Để bỏ dòng bắt đầu với '+/-' Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> | 16 March 2020, 07:21:58 UTC |
| 5c20398 | Emily Shaffer | 03 March 2020, 04:05:06 UTC | prefix_path: show gitdir if worktree unavailable If there is no worktree at present, we can still hint the user about Git's current directory by showing them the absolute path to the Git directory. Even though the Git directory doesn't make it as easy to locate the worktree in question, it can still help a user figure out what's going on while developing a script. This fixes a segmentation fault introduced in e0020b2f ("prefix_path: show gitdir when arg is outside repo", 2020-02-14). Signed-off-by: Emily Shaffer <emilyshaffer@google.com> [jc: added minimum tests, with help from Szeder Gábor] Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 March 2020, 16:35:46 UTC |
| 1fae9a4 | Yi-Jyun | 13 March 2020, 17:12:19 UTC | l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated) Revision 2. Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com> | 14 March 2020, 17:58:00 UTC |
| c73cfd5 | Yi-Jyun | 09 March 2020, 17:33:00 UTC | l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated) Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com> | 14 March 2020, 17:57:37 UTC |
| a4a2f64 | Pratyush Yadav | 14 March 2020, 17:22:43 UTC | Merge branch 'js/askpass-coerce-utf8' Askpass can now send non-ASCII to Git on Windows. * js/askpass-coerce-utf8: git-gui--askpass: coerce answers to UTF-8 on Windows | 14 March 2020, 17:22:43 UTC |
| 850cf9a | Luke Bonanomi | 12 March 2020, 21:31:50 UTC | git-gui--askpass: coerce answers to UTF-8 on Windows This addresses the issue where Git for Windows asks the user for a password, no credential helper is available, and then Git fails to pick up non-ASCII characters from the Git GUI helper. This can be verified e.g. via echo host=http://abc.com | git -c credential.helper= credential fill and then pasting some umlauts. The underlying reason is that Git for Windows tries to communicate using the UTF-8 encoding no matter what the actual current code page is. So let's indulge Git for Windows and do use that encoding. This fixes https://github.com/git-for-windows/git/issues/2215 Signed-off-by: Luke Bonanomi <lbonanomi@gmail.com> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pratyush Yadav <me@yadavpratyush.com> | 14 March 2020, 17:16:40 UTC |
| d769dcc | Pratyush Yadav | 14 March 2020, 17:11:45 UTC | Merge branch 'py/blame-status-error' Fixes an error popup in blame because of a missing closing bracket. * py/blame-status-error: git-gui: fix error popup when doing blame -> "Show History Context" | 14 March 2020, 17:11:45 UTC |
| 70e2418 | Elijah Newren | 13 March 2020, 20:03:02 UTC | t6022, t6046: fix flaky files-are-updated checks Several tests wanted to verify that files were actually modified by a merge, which it would do by checking that the mtime was updated. In order to avoid problems with the merge completing so fast that the mtime at the beginning and end of the operation was the same, these tests would first set the mtime of a file to something "old". This "old" value was usually determined as current system clock minus one second, truncated to the nearest integer. Unfortunately, it appears the system clock and filesystem clock are different and comparing across the two runs into race problems resulting in flaky tests. From https://stackoverflow.com/questions/14392975/timestamp-accuracy-on-ext4-sub-millsecond: date will call the gettimeofday system call which will always return the most accurate time available based on the cached kernel time, adjusted by the CPU cycle time if available to give nanosecond resolution. The timestamps stored in the file system however, are only based on the cached kernel time. ie The time calculated at the last timer interrupt. and from https://apenwarr.ca/log/20181113: Does mtime get set to >= the current time? No, this depends on clock granularity. For example, gettimeofday() can return times in microseconds on my system, but ext4 rounds timestamps down to the previous ~10ms (but not exactly 10ms) increment, with the surprising result that a newly-created file is almost always created in the past: $ python -c " import os, time t0 = time.time() open('testfile', 'w').close() print os.stat('testfile').st_mtime - t0 " -0.00234484672546 So, instead of trying to compare across what are effectively two different clocks, just avoid using the system clock. Any new updates to files have to give an mtime at least as big as what is already in the file, so we could define "old" as one second before the mtime found in the file before the merge starts. But, to avoid problems with leap seconds, ntp updates, filesystems that only provide two second resolution, and other such weirdness, let's just pick an hour before the mtime found in the file before the merge starts. Also, clarify in one test where we check the mtime of different files that it really was intentional. I totally forgot the reasons for that and assumed it was a bug when asked. Reported-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 March 2020, 20:06:47 UTC |
| 30e9940 | Junio C Hamano | 12 March 2020, 21:36:00 UTC | Hopefully the final batch before -rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 March 2020, 21:36:00 UTC |
| b4f0038 | Junio C Hamano | 12 March 2020, 21:28:01 UTC | Merge branch 'en/rebase-backend' Band-aid fixes for two fallouts from switching the default "rebase" backend. * en/rebase-backend: git-rebase.txt: highlight backend differences with commit rewording sequencer: clear state upon dropping a become-empty commit i18n: unmark a message in rebase.c | 12 March 2020, 21:28:01 UTC |
| 25f7d68 | Jiang Xin | 12 March 2020, 10:41:56 UTC | Merge branch of github.com:ChrisADR/git-po into master * 'next' of github.com:ChrisADR/git-po: l10n: es: 2.26.0 round#2 | 12 March 2020, 10:41:56 UTC |
| 17ed936 | Alessandro Menti | 12 March 2020, 06:52:58 UTC | l10n: it.po: update the Italian translation for Git 2.26.0 round 2 Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it> | 12 March 2020, 06:52:58 UTC |
| 1afe18a | Christopher Diaz Riveros | 12 March 2020, 04:19:58 UTC | l10n: es: 2.26.0 round#2 Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org> | 12 March 2020, 04:19:58 UTC |
| 5ab9217 | Jiang Xin | 12 March 2020, 02:17:22 UTC | Merge branch of github.com:alshopov/git-po into master * 'git-l10n_git-po_master' of github.com:alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (4839t) | 12 March 2020, 02:17:22 UTC |
| c671367 | Jiang Xin | 12 March 2020, 02:15:49 UTC | Merge branch of github.com:bitigchi/git-po into master * 'tr_translations_2.26.1' of github.com:bitigchi/git-po: l10n: tr: v2.26.0 round 2 | 12 March 2020, 02:15:49 UTC |
| b22e556 | Alexander Shopov | 11 March 2020, 23:04:37 UTC | l10n: bg.po: Updated Bulgarian translation (4839t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 11 March 2020, 23:04:37 UTC |
| 2713dec | Emir Sarı | 11 March 2020, 21:09:51 UTC | l10n: tr: v2.26.0 round 2 Signed-off-by: Emir Sarı <bitigchi@me.com> | 11 March 2020, 21:09:51 UTC |
| c9ef57c | Jean-Noël Avila | 11 March 2020, 20:19:25 UTC | l10n: fr : v2.26.0 rnd 2 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> | 11 March 2020, 20:19:25 UTC |
| 120b1eb | Elijah Newren | 11 March 2020, 15:30:23 UTC | git-rebase.txt: highlight backend differences with commit rewording As noted by Junio: Back when "git am" was written, it was not considered a bug that the "git am --resolved" option did not offer the user a chance to update the log message to match the adjustment of the code the user made, but honestly, I'd have to say that it is a bug in "git am" in that over time it wasn't adjusted to the new world order where we encourage users to describe what they did when the automation hiccuped by opening an editor. These days, even when automation worked well (e.g. a clean auto-merge with "git merge"), we open an editor. The world has changed, and so should the expectations. Junio also suggested providing a workaround such as allowing --no-edit together with git rebase --continue, but that should probably be done in a patch after the git-2.26.0 release. For now, just document the known difference in the Behavioral Differences section. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 March 2020, 19:11:08 UTC |
| 9a1b747 | Elijah Newren | 11 March 2020, 15:30:22 UTC | sequencer: clear state upon dropping a become-empty commit In commit e98c4269c8 ("rebase (interactive-backend): fix handling of commits that become empty", 2020-02-15), the merge backend was changed to drop commits that did not start empty but became so after being applied (because their changes were a subset of what was already upstream). This new code path did not need to go through the process of creating a commit, since we were dropping the commit instead. Unfortunately, this also means we bypassed the clearing of the CHERRY_PICK_HEAD and MERGE_MSG files, which if there were no further commits to cherry-pick would mean that the rebase would end but assume there was still an operation in progress. Ensure that we clear such state files when we decide to drop the commit. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 March 2020, 19:11:05 UTC |
| 937d143 | Jiang Xin | 11 March 2020, 06:55:27 UTC | i18n: unmark a message in rebase.c Commit v2.25.0-4-ge98c4269c8 (rebase (interactive-backend): fix handling of commits that become empty, 2020-02-15) marked "{drop,keep,ask}" for translation, but this message should not be changed. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 March 2020, 18:39:01 UTC |
| a56d361 | Junio C Hamano | 11 March 2020, 17:58:16 UTC | Merge branch 'ds/sparse-add' Test fix. * ds/sparse-add: t1091: don't grep for `strerror()` string | 11 March 2020, 17:58:16 UTC |
| 5fa9169 | Junio C Hamano | 11 March 2020, 17:58:16 UTC | Merge branch 'dr/push-remote-ref-update' Code clean-up. * dr/push-remote-ref-update: remote: drop "explicit" parameter from remote_ref_for_branch() | 11 March 2020, 17:58:16 UTC |
| cdef998 | Junio C Hamano | 11 March 2020, 17:58:16 UTC | Merge branch 'jc/doc-single-h-is-for-help' Both "git ls-remote -h" and "git grep -h" give short usage help, like any other Git subcommand, but it is not unreasonable to expect that the former would behave the same as "git ls-remote --head" (there is no other sensible behaviour for the latter). The documentation has been updated in an attempt to clarify this. * jc/doc-single-h-is-for-help: Documentation: clarify that `-h` alone stands for `help` | 11 March 2020, 17:58:16 UTC |
| 051fae4 | Jiang Xin | 11 March 2020, 06:59:57 UTC | l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed) Generate po/git.pot from v2.26.0-rc1 for git v2.26.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 11 March 2020, 07:27:39 UTC |
| 52b2742 | Jiang Xin | 11 March 2020, 06:59:05 UTC | Merge branch 'master' of github.com:git/git into git-po-master * 'master' of github.com:git/git: (27 commits) Git 2.26-rc1 remote-curl: show progress for fetches over dumb HTTP show_one_mergetag: print non-parent in hex form. config.mak.dev: re-enable -Wformat-zero-length rebase-interactive.c: silence format-zero-length warnings mingw: workaround for hangs when sending STDIN t6020: new test with interleaved lexicographic ordering of directories t6022, t6046: test expected behavior instead of testing a proxy for it t3035: prefer test_must_fail to bash negation for git commands t6020, t6022, t6035: update merge tests to use test helper functions t602[1236], t6034: modernize test formatting merge-recursive: apply collision handling unification to recursive case completion: add diff --color-moved[-ws] t1050: replace test -f with test_path_is_file am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch am: support --show-current-patch=raw as a synonym for--show-current-patch am: convert "resume" variable to a struct parse-options: convert "command mode" to a flag parse-options: add testcases for OPT_CMDMODE() stash push: support the --pathspec-from-file option ... | 11 March 2020, 06:59:05 UTC |
| 9643441 | Emir Sarı | 10 March 2020, 20:31:48 UTC | l10n: tr: Add glossary for Turkish translations Signed-off-by: Emir Sarı <bitigchi@me.com> | 10 March 2020, 20:31:48 UTC |
| 4383932 | Jiang Xin | 10 March 2020, 06:28:22 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 (4835t0f0u) | 10 March 2020, 06:28:22 UTC |
| fa89e04 | Jiang Xin | 10 March 2020, 06:26:58 UTC | Merge branch 'fr_2.26.0' of github.com:jnavila/git * 'fr_2.26.0' of github.com:jnavila/git: l10n: fr v2.26.0 rnd1 | 10 March 2020, 06:26:58 UTC |
| 2591c4c | Peter Krefting | 09 March 2020, 19:57:46 UTC | l10n: sv.po: Update Swedish translation (4835t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 09 March 2020, 20:02:58 UTC |
| dd2c269 | Emir Sarı | 09 March 2020, 18:41:28 UTC | l10n: tr: Add Turkish translations Signed-off-by: Emir Sarı <bitigchi@me.com> | 09 March 2020, 18:41:28 UTC |
| 8f4f099 | Emir Sarı | 09 March 2020, 18:39:08 UTC | l10n: tr: Add Turkish translation team info Signed-off-by: Emir Sarı <bitigchi@me.com> | 09 March 2020, 18:39:08 UTC |
| b4374e9 | Junio C Hamano | 09 March 2020, 18:20:59 UTC | Git 2.26-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2020, 18:21:21 UTC |
| 4a5c3e1 | Junio C Hamano | 09 March 2020, 18:21:21 UTC | Merge branch 'rs/show-progress-in-dumb-http-fetch' "git fetch" over HTTP walker protocol did not show any progress output. We inherently do not know how much work remains, but still we can show something not to bore users. * rs/show-progress-in-dumb-http-fetch: remote-curl: show progress for fetches over dumb HTTP | 09 March 2020, 18:21:21 UTC |
| 3658d77 | Junio C Hamano | 09 March 2020, 18:21:21 UTC | Merge branch 'hd/show-one-mergetag-fix' "git show" and others gave an object name in raw format in its error output, which has been corrected to give it in hex. * hd/show-one-mergetag-fix: show_one_mergetag: print non-parent in hex form. | 09 March 2020, 18:21:21 UTC |
| 6125104 | Junio C Hamano | 09 March 2020, 18:21:21 UTC | Merge branch 'rt/format-zero-length-fix' Recently we inadvertently added a few instances of using 0-width format string to functions that we mark as printf-like without any developers noticing. The root cause was that the compiler warning that is triggered by this is almost always useless and we disabled the warning in our developer builds, but not for general public. The new instances have been corrected, and the warning has been resurrected in the developer builds. * rt/format-zero-length-fix: config.mak.dev: re-enable -Wformat-zero-length rebase-interactive.c: silence format-zero-length warnings | 09 March 2020, 18:21:21 UTC |
| 1ac37de | Junio C Hamano | 09 March 2020, 18:21:20 UTC | Merge branch 'am/mingw-poll-fix' MinGW's poll() emulation has been improved. * am/mingw-poll-fix: mingw: workaround for hangs when sending STDIN | 09 March 2020, 18:21:20 UTC |
| cf372dc | Junio C Hamano | 09 March 2020, 18:21:20 UTC | Merge branch 'en/test-cleanup' Test cleanup. * en/test-cleanup: t6020: new test with interleaved lexicographic ordering of directories t6022, t6046: test expected behavior instead of testing a proxy for it t3035: prefer test_must_fail to bash negation for git commands t6020, t6022, t6035: update merge tests to use test helper functions t602[1236], t6034: modernize test formatting | 09 March 2020, 18:21:20 UTC |
| d1075ad | Junio C Hamano | 09 March 2020, 18:21:20 UTC | Merge branch 'en/merge-path-collision' Handling of conflicting renames in merge-recursive have further been made consistent with how existing codepaths try to mimic what is done to add/add conflicts. * en/merge-path-collision: merge-recursive: apply collision handling unification to recursive case | 09 March 2020, 18:21:20 UTC |
| a4fd114 | Junio C Hamano | 09 March 2020, 18:21:20 UTC | Merge branch 'kk/complete-diff-color-moved' Completion update. * kk/complete-diff-color-moved: completion: add diff --color-moved[-ws] | 09 March 2020, 18:21:20 UTC |
| a0d752c | Junio C Hamano | 09 March 2020, 18:21:19 UTC | Merge branch 'rj/t1050-use-test-path-is-file' Code cleanup. * rj/t1050-use-test-path-is-file: t1050: replace test -f with test_path_is_file | 09 March 2020, 18:21:20 UTC |
| 0e0d717 | Junio C Hamano | 09 March 2020, 18:21:19 UTC | Merge branch 'pb/am-show-current-patch' "git am --short-current-patch" is a way to show the piece of e-mail for the stopped step, which is not suitable to directly feed "git apply" (it is designed to be a good "git am" input). It learned a new option to show only the patch part. * pb/am-show-current-patch: am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch am: support --show-current-patch=raw as a synonym for--show-current-patch am: convert "resume" variable to a struct parse-options: convert "command mode" to a flag parse-options: add testcases for OPT_CMDMODE() | 09 March 2020, 18:21:19 UTC |
| 9b7f726 | Junio C Hamano | 09 March 2020, 18:21:19 UTC | Merge branch 'am/pathspec-f-f-more' "git rm" and "git stash" learns the new "--pathspec-from-file" option. * am/pathspec-f-f-more: stash push: support the --pathspec-from-file option stash: eliminate crude option parsing doc: stash: synchronize <pathspec> description doc: stash: document more options doc: stash: split options from description (2) doc: stash: split options from description (1) rm: support the --pathspec-from-file option doc: rm: synchronize <pathspec> description | 09 March 2020, 18:21:19 UTC |
| 4605a73 | Martin Ågren | 08 March 2020, 08:46:27 UTC | t1091: don't grep for `strerror()` string We grep for "File exists" in stderr of the failing `git sparse-checkout` to make sure that it failed for the right reason. We expect the string to show up there since we call `strerror(errno)` in `unable_to_lock_message()` in lockfile.c. On the NonStop platform, this fails because the error string is "File already exists", which doesn't match our grepping. See 9042140097 ("test-dir-iterator: do not assume errno values", 2019-07-30) for a somewhat similar fix. There, we patched a test helper, which meant we had access to `errno` and could investigate it better in the test helper instead of just outputting the numerical value and evaluating it in the test script. The current situation is different, since (short of modifying the lockfile machinery, e.g., to be more verbose) we don't have more than the output from `strerror()` available. Except we do: We prefix `strerror(errno)` with `_("Unable to create '%s.lock': ")`. Let's grep for that part instead. It verifies that we were indeed unable to create the lock file. (If that fails for some other reason than the file existing, we really really should expect other tests to fail as well.) An alternative fix would be to loosen the expression a bit and grep for "File.* exists" instead. There would be no guarantee that some other implementation couldn't come up with another error string, That is, that could be the first move in an endless game of whack-a-mole. Of course, it could also take us from "99" to "100" percent of the platforms and we'd never have this problem again. But since we have another way of addressing this, let's not even try the "loosen it up a bit" strategy. Reported-by: Randall S. Becker <rsbecker@nexbridge.com> 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> | 09 March 2020, 15:05:13 UTC |
| 4d9c290 | Jean-Noël Avila | 07 March 2020, 21:35:29 UTC | l10n: fr v2.26.0 rnd1 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> | 08 March 2020, 22:26:01 UTC |
| ad182be | Jiang Xin | 08 March 2020, 15:44:13 UTC | Merge branch of github.com:alshopov/git-po into master * 'git-l10n_git-po_master' of github.com:alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (4835t) | 08 March 2020, 15:44:13 UTC |
| 23fa467 | Alessandro Menti | 07 March 2020, 08:57:36 UTC | l10n: it.po: update the Italian translation for Git 2.26.0 round 1 Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it> | 07 March 2020, 08:57:36 UTC |
| 98f2407 | Alexander Shopov | 01 March 2020, 17:18:57 UTC | l10n: bg.po: Updated Bulgarian translation (4835t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 06 March 2020, 06:52:57 UTC |
| f7c6172 | Jiang Xin | 06 March 2020, 06:27:08 UTC | l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed) Generate po/git.pot from v2.26.0-rc0 for git v2.26.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 06 March 2020, 06:27:08 UTC |
| 76b1dcd | Jiang Xin | 06 March 2020, 06:24:01 UTC | Merge branch 'master' of github.com:git-l10n/git-po * 'master' of github.com:git-l10n/git-po: l10n: Update Catalan translation l10n: Update Catalan translation | 06 March 2020, 06:24:01 UTC |
| 076cbdc | Junio C Hamano | 05 March 2020, 19:15:45 UTC | Git 2.26-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2020, 19:15:45 UTC |
| 0d65f3f | Johannes Schindelin | 04 March 2020, 15:53:12 UTC | t5537: adjust test_oid label We recently switched to using Perl instead of `sed` in the httpd-based tests. Let's reflect that in the label we give the corresponding commit hashes. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2020, 19:09:56 UTC |
