[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 7/7] buildsys: Help git-diff adding .gitattributes config file
From: |
Paolo Bonzini |
Subject: |
[PULL 7/7] buildsys: Help git-diff adding .gitattributes config file |
Date: |
Wed, 18 Nov 2020 11:19:40 +0100 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Since commits 0979ed017f0 ("meson: rename .inc.h files to .h.inc")
and 139c1837db7 ("meson: rename included C source files to .c.inc")
'git-diff --function-context' stopped displaying C function context
correctly.
We can help git-diff by providing attributes to the .[ch].inc path
names. See:
https://git-scm.com/docs/gitattributes#_generating_diff_text
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20201014082209.3712625-1-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
.gitattributes | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 .gitattributes
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..3d2fe2ecda
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.c.inc diff=c
+*.h.inc diff=c
--
2.28.0
- [PULL 0/7] HVF and Windows changes for QEMU 5.2-rc, Paolo Bonzini, 2020/11/18
- [PULL 1/7] meson: Fix argument for makensis (build regression), Paolo Bonzini, 2020/11/18
- [PULL 2/7] docs: Fix some typos (found by codespell), Paolo Bonzini, 2020/11/18
- [PULL 4/7] meson: Fixes curses detection on msys2, Paolo Bonzini, 2020/11/18
- [PULL 3/7] meson: Fix build with --disable-guest-agent-msi, Paolo Bonzini, 2020/11/18
- [PULL 5/7] hvf: Gate RDTSCP on CPU_BASED2_RDTSCP, not just CPU_BASED_TSC_OFFSET, Paolo Bonzini, 2020/11/18
- [PULL 6/7] hvf: Fix segment selector format, Paolo Bonzini, 2020/11/18
- [PULL 7/7] buildsys: Help git-diff adding .gitattributes config file,
Paolo Bonzini <=
- Re: [PULL 0/7] HVF and Windows changes for QEMU 5.2-rc, Peter Maydell, 2020/11/18