aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/setlocalversion
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2025-01-19 15:51:45 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2025-01-19 15:51:45 -0800
commitffd294d346d185b70e28b1a28abe367bbfe53c04 (patch)
tree97c4cd5bdb35cc6533cf38794c743cb54c674843 /scripts/setlocalversion
parentMerge tag 'x86_urgent_for_v6.13' of git://git.kernel.org/pub/scm/linux/kernel... (diff)
downloadlinux-for-next.tar.gz
linux-for-next.zip
Linux 6.13v6.13for-next
Diffstat (limited to 'scripts/setlocalversion')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-17 11:47:15 +0000
?h=v2.26.1&id=4914ba4bcf82c2313ca2d94199110b035a08ad8e&follow=1'>l10n: tr: Fix a couple of ambiguitiesEmir Sarı1-9/+9 Signed-off-by: Emir Sarı <bitigchi@me.com> 2020-03-18RelNotes/2.26.0: fix various typosElijah Newren1-4/+4 Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2020-03-18l10n: Update Catalan translationJordi Mas1-80/+71 Signed-off-by: Jordi Mas <jmas@softcatala.org> 2020-03-17Git 2.25.2v2.25.2Junio C Hamano3-2/+62 Signed-off-by: Junio C Hamano <gitster@pobox.com> 2020-03-17unicode: update the width tables to Unicode 13.0Beat Bolli1-16/+27 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> 2020-03-17Git 2.17.4v2.17.4Junio C Hamano3-2/+18 Signed-off-by: Junio C Hamano <gitster@pobox.com> 2020-03-17l10n: sv.po: Update Swedish translation (4839t0f0u)Peter Krefting1-266/+296 Signed-off-by: Peter Krefting <peter@softwolves.pp.se> 2020-03-17git-gui: create a new namespace for chord script evaluationPratyush Yadav1-2/+4 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> 2020-03-17git-gui: reduce Tcl version requirement from 8.6 to 8.5Pratyush Yadav3-35/+33 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> 2020-03-17l10n: zh_CN: Revise v2.26.0 translationFangyi Zhou1-26/+26 Signed-off-by: Fangyi Zhou <me@fangyi.io> Reviewed-by: 依云 <lilydjwg@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> 2020-03-17l10n: zh_CN: for git v2.26.0 l10n round 1 and 2Jiang Xin1-2541/+2844 Translate 79 new messages (4839t0f0u) for git 2.26.0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> 2020-03-16Git 2.26-rc2v2.26.0-rc2Junio C Hamano2-5/+4 Signed-off-by: Junio C Hamano <gitster@pobox.com> 2020-03-16l10n: vi(4839t): Updated Vietnamese translation for v2.26.0Tran Ngoc Quan1-2557/+2975 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> 2020-03-16l10n: vi: fix translation + grammarĐoàn Trần Công Danh1-14/+14 - 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> 2020-03-15prefix_path: show gitdir if worktree unavailableEmily Shaffer3-4/+50 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> 2020-03-15l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated)Yi-Jyun1-388/+289 Revision 2. Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com> 2020-03-15l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated)Yi-Jyun1-2604/+2823 Signed-off-by: Yi-Jyun Pan <pan93412@gmail.com> 2020-03-14git-gui--askpass: coerce answers to UTF-8 on WindowsLuke Bonanomi1-0/+5 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> 2020-03-13t6022, t6046: fix flaky files-are-updated checksElijah Newren2-23/+17 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> 2020-03-12Hopefully the final batch before -rc2Junio C Hamano1-0/+21 Signed-off-by: Junio C Hamano <gitster@pobox.com> 2020-03-12fsck: detect gitmodules URLs with embedded newlinesJeff King2-2/+32 The credential protocol can't handle values with newlines. We already detect and block any such URLs from being used with credential helpers, but let's also add an fsck check to detect and block gitmodules files with such URLs. That will let us notice the problem earlier when transfer.fsckObjects is turned on. And in particular it will prevent bad objects from spreading, which may protect downstream users running older versions of Git. We'll file this under the existing gitmodulesUrl flag, which covers URLs with option injection. There's really no need to distinguish the exact flaw in the URL in this context. Likewise, I've expanded the description of t7416 to cover all types of bogus URLs. 2020-03-12credential: detect unrepresentable values when parsing urlsJeff King3-4/+60 The credential protocol can't represent newlines in values, but URLs can embed percent-encoded newlines in various components. A previous commit taught the low-level writing routines to die() when encountering this, but we can be a little friendlier to the user by detecting them earlier and handling them gracefully. This patch teaches credential_from_url() to notice such components, issue a warning, and blank the credential (which will generally result in prompting the user for a username and password). We blank the whole credential in this case. Another option would be to blank only the invalid component. However, we're probably better off not feeding a partially-parsed URL result to a credential helper. We don't know how a given helper would handle it, so we're better off to err on the side of matching nothing rather than something unexpected. The die() call in credential_write() is _probably_ impossible to reach after this patch. Values should end up in credential structs only by URL parsing (which is covered here), or by reading credential protocol input (which by definition cannot read a newline into a value). But we should definitely keep the low-level check, as it's our final and most accurate line of defense against protocol injection attacks. Arguably it could become a BUG(), but it probably doesn't matter much either way. Note that the public interface of credential_from_url() grows a little more than we need here. We'll use the extra flexibility in a future patch to help fsck catch these cases. 2020-03-12t/lib-credential: use test_i18ncmp to check stderrJeff King1-1/+1 The credential tests have a "check" function which feeds some input to git-credential and checks the stdout and stderr. We look for exact matches in the output. For stdout, this makes sense; the output is the credential protocol. But for stderr, we may be showing various diagnostic messages, or the prompts fed to the askpass program, which could be translated. Let's mark them as such. 2020-03-12credential: avoid writing values with newlinesJeff King2-0/+8 The credential protocol that we use to speak to helpers can't represent values with newlines in them. This was an intentional design choice to keep the protocol simple, since none of the values we pass should generally have newlines. However, if we _do_ encounter a newline in a value, we blindly transmit it in credential_write(). Such values may break the protocol syntax, or worse, inject new valid lines into the protocol stream. The most likely way for a newline to end up in a credential struct is by decoding a URL with a percent-encoded newline. However, since the bug occurs at the moment we write the value to the protocol, we'll catch it there. That should leave no possibility of accidentally missing a code path that can trigger the problem. At this level of the code we have little choice but to die(). However, since we'd not ever expect to see this case outside of a malicious URL, that's an acceptable outcome. Reported-by: Felix Wilhelm <fwilhelm@google.com> 2020-03-12l10n: it.po: update the Italian translation for Git 2.26.0 round 2Alessandro Menti1-267/+297 Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it> 2020-03-11l10n: es: 2.26.0 round#2Christopher Diaz Riveros1-2550/+2979 Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org> 2020-03-12l10n: bg.po: Updated Bulgarian translation (4839t)Alexander Shopov1-242/+270 Signed-off-by: Alexander Shopov <ash@kambanaria.org> 2020-03-12l10n: tr: v2.26.0 round 2Emir Sarı1-262/+284 Signed-off-by: Emir Sarı <bitigchi@me.com> 2020-03-11l10n: fr : v2.26.0 rnd 2Jean-Noël Avila1-353/+308 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> 2020-03-11git-rebase.txt: highlight backend differences with commit rewordingElijah Newren1-0/+10 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> 2020-03-11sequencer: clear state upon dropping a become-empty commitElijah Newren2-0/+10 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> 2020-03-11i18n: unmark a message in rebase.cJiang Xin1-1/+1 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> 2020-03-11l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed)Jiang Xin1-238/+260 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> 2020-03-10l10n: tr: Add glossary for Turkish translationsEmir Sarı1-4/+87 Signed-off-by: Emir Sarı <bitigchi@me.com> 2020-03-09l10n: sv.po: Update Swedish translation (4835t0f0u)Peter Krefting1-2379/+2764 Signed-off-by: Peter Krefting <peter@softwolves.pp.se>