From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 7/7] buildsys: Help git-diff adding .gitattributes config file
Date: Wed, 18 Nov 2020 11:19:40 +0100 [thread overview]
Message-ID: <20201118101940.132594-8-pbonzini@redhat.com> (raw)
In-Reply-To: <20201118101940.132594-1-pbonzini@redhat.com>
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
next prev parent reply other threads:[~2020-11-18 10:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-18 10:19 [PULL 0/7] HVF and Windows changes for QEMU 5.2-rc Paolo Bonzini
2020-11-18 10:19 ` [PULL 1/7] meson: Fix argument for makensis (build regression) Paolo Bonzini
2020-11-18 10:19 ` [PULL 2/7] docs: Fix some typos (found by codespell) Paolo Bonzini
2020-11-18 10:19 ` [PULL 3/7] meson: Fix build with --disable-guest-agent-msi Paolo Bonzini
2020-11-18 10:19 ` [PULL 4/7] meson: Fixes curses detection on msys2 Paolo Bonzini
2020-11-18 10:19 ` [PULL 5/7] hvf: Gate RDTSCP on CPU_BASED2_RDTSCP, not just CPU_BASED_TSC_OFFSET Paolo Bonzini
2020-11-18 10:19 ` [PULL 6/7] hvf: Fix segment selector format Paolo Bonzini
2020-11-18 10:19 ` Paolo Bonzini [this message]
2020-11-18 13:42 ` [PULL 0/7] HVF and Windows changes for QEMU 5.2-rc Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201118101940.132594-8-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).