Changes in .gitattributes

8f8d4be9 - .gitattributes: set diff driver for Rust source code files

Tue, 18 Apr 2023 23:30:48 +0000

.gitattributes: set diff driver for Rust source code filesGit supports a builtin Rust diff driver [1] since v2.23.0 (2019).It improves the choice of hunk headers in some cases, such asdiffs within methods, since those are indented in Rust withinan `impl` block, and therefore the default diff driver wouldpick the outer `impl` block instead (rather than the methodwhere the changed code is).For instance, with the default diff driver: @@ -455,6 +455,8 @@ impl fmt::Write for RawFormatter { // Amount that we can copy. `saturating_sub` ensures we get 0 if `pos` goes past `end`. let len_to_copy = core::cmp::min(pos_new, self.end).saturating_sub(self.pos); + test_diff_driver(); + if len_to_copy > 0 { // SAFETY: If `len_to_copy` is non-zero, then we know `pos` has not gone past `end` // yet, so it is valid for write per the type invariants.With the Rust diff driver: @@ -455,6 +455,8 @@ fn write_str(&mut self, s: &str) -> fmt::Result { // Amount that we can copy. `saturating_sub` ensures we get 0 if `pos` goes past `end`. let len_to_copy = core::cmp::min(pos_new, self.end).saturating_sub(self.pos); + test_diff_driver(); + if len_to_copy > 0 { // SAFETY: If `len_to_copy` is non-zero, then we know `pos` has not gone past `end` // yet, so it is valid for write per the type invariants.Thus set the `rust` diff driver for `*.rs` source files.The Rust repository also does so since 2020 [2].Link: https://git-scm.com/docs/gitattributes#_defining_a_custom_hunk_header [1]Link: https://github.com/rust-lang/rust/pull/78882 [2]Reviewed-by: Gary Guo Reviewed-by: Martin Rodriguez Reboredo Reviewed-by: Benno Lossin Link: https://lore.kernel.org/r/20230418233048.335281-1-ojeda@kernel.org[ Added link to Rust repository ]Signed-off-by: Miguel Ojeda List of files: /linux-6.15/.gitattributes

ae41e0e4 - .gitattributes: use 'dts' diff driver for *.dtso files

Sun, 19 Feb 2023 14:23:27 +0000

.gitattributes: use 'dts' diff driver for *.dtso filesNow we have the third extension for DT source files (overlay).Give the diff=dts attribute to *.dtso as well.While I was here, I merged *.c and *.o into *.[ch] and added theSPDX-License-Identifier.Signed-off-by: Masahiro Yamada List of files: /linux-6.15/.gitattributes

a512ae54 - .gitattributes: use 'dts' diff driver for dts files

Thu, 05 Dec 2019 00:50:17 +0000

.gitattributes: use 'dts' diff driver for dts filesGit is gaining support to display the closest node to the diff in thehunk header via the 'dts' diff driver. Use that driver for all dts anddtsi files so we can gain some more context on where the diff is.Taking a recent commit in the kernel dts files you can see thedifference.With this patch and an updated git: diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi: index 62e07e1197cc..4c38426a6969 100644: --- a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi: +++ b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi: @@ -289,5 +289,29 @@ vdd_hdmi: regulator@1 {: gpio = <&gpio TEGRA194_MAIN_GPIO(A, 3) GPIO_ACTIVE_HIGH>;: enable-active-high;: };: +: + vdd_3v3_pcie: regulator@2 {: + compatible = "regulator-fixed";vs. without this patch: diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi: index 62e07e1197cc..4c38426a6969 100644: --- a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi: +++ b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi: @@ -289,5 +289,29 @@: gpio = <&gpio TEGRA194_MAIN_GPIO(A, 3) GPIO_ACTIVE_HIGH>;: enable-active-high;: };: +: + vdd_3v3_pcie: regulator@2 {: + compatible = "regulator-fixed";You can see that we don't know what the context node is because it isn'tshown after the '@@'.dts is not released yet but it is staged to be in the next release[1].One can probably build git from source and try it out.[1] https://git.kernel.org/pub/scm/git/git.git/commit/?id=d49c2c3466d2c8cb0b3d0a43e6b406b07078fdb1Link: http://lkml.kernel.org/r/20191004212311.141538-1-swboyd@chromium.orgSigned-off-by: Stephen Boyd Cc: Rob Herring Cc: Randy Dunlap Acked-by: Frank Rowand Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds List of files: /linux-6.15/.gitattributes

218dd858 - .gitattributes: set git diff driver for C source code files

Sat, 08 Oct 2016 00:03:04 +0000

.gitattributes: set git diff driver for C source code filesGit can be told to apply language-specific rules when generating diffs.Enable this for C source code files (*.c and *.h) so that function namesare printed right. Specifically, doing so prevents "git diff" frommistakenly considering unindented goto labels as function names.Link: http://lkml.kernel.org/r/20160907143403.1449324f@endymionSigned-off-by: Jean Delvare Cc: Peter Zijlstra Cc: Joe Perches Cc: Jonathan Corbet Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds List of files: /linux-6.15/.gitattributes