[Qemu-devel] [PULL 0/2] Misc 20170720 patches

[Qemu-devel] [PULL 0/2] Misc 20170720 patches

[Gerd Hoffmann]

The following changes since commit d4e59218ab80e86015753782fb5378767a51ccd0:

  Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2017-07-18-2' into staging (2017-07-19 20:45:37 +0100)

are available in the git repository at:

  git://git.kraxel.org/qemu tags/misc-20170720-pull-request

for you to fetch changes up to a62e20f6f84d747e55891a0d8aadd0737297571e:

  add editorconfig (2017-07-20 09:56:56 +0200)

----------------------------------------------------------------
git orderfile and editorconfig for 2.10

----------------------------------------------------------------

Gerd Hoffmann (2):
  add scripts/git.orderfile
  add editorconfig

 .editorconfig         | 15 +++++++++++++++
 scripts/git.orderfile | 29 +++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 .editorconfig
 create mode 100644 scripts/git.orderfile

-- 
2.9.3

[Qemu-devel] [PULL 1/2] add scripts/git.orderfile

[Gerd Hoffmann]

Based on a old patch by Laszlo.
Time to get this in ...

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Emilio G. Cota <cota@braap.org>
Message-id: 20170717101632.23247-1-kraxel@redhat.com
---
 scripts/git.orderfile | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 scripts/git.orderfile

diff --git a/scripts/git.orderfile b/scripts/git.orderfile
new file mode 100644
index 0000000000..ac699700b1
--- /dev/null
+++ b/scripts/git.orderfile
@@ -0,0 +1,29 @@
+#
+# order file for git, to produce patches which are easier to review
+# by diffing the important stuff like interface changes first.
+#
+# one-off usage:
+#   git diff -O scripts/git.orderfile ...
+#
+# add to git config:
+#   git config diff.orderFile scripts/git.orderfile
+#
+
+# Documentation
+docs/*
+*.texi
+
+# build system
+configure
+Makefile*
+*.mak
+
+# qapi schema
+*.json
+
+# headers
+*.h
+
+# code
+*.c
+
-- 
2.9.3

[Qemu-devel] [PULL 2/2] add editorconfig

[Gerd Hoffmann]

Add a .editorconfig file for qemu.  Specifies the indent and tab style
for various files (C code and Makefiles for starters).  Most popular
editors support this either natively or via plugin.

Check http://editorconfig.org/ for details.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20170717101547.22295-1-kraxel@redhat.com
---
 .editorconfig | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..b2022e391a
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+# http://editorconfig.org
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+
+[Makefile*]
+indent_style = tab
+indent_size = 8
+
+[*.{c,h}]
+indent_style = space
+indent_size = 4
-- 
2.9.3

Re: [Qemu-devel] [PULL 0/2] Misc 20170720 patches

[Peter Maydell]

On 20 July 2017 at 09:00, Gerd Hoffmann <kraxel@redhat.com> wrote:
> The following changes since commit d4e59218ab80e86015753782fb5378767a51ccd0:
>
>   Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2017-07-18-2' into staging (2017-07-19 20:45:37 +0100)
>
> are available in the git repository at:
>
>   git://git.kraxel.org/qemu tags/misc-20170720-pull-request
>
> for you to fetch changes up to a62e20f6f84d747e55891a0d8aadd0737297571e:
>
>   add editorconfig (2017-07-20 09:56:56 +0200)
>
> ----------------------------------------------------------------
> git orderfile and editorconfig for 2.10
>
> ----------------------------------------------------------------
>
> Gerd Hoffmann (2):
>   add scripts/git.orderfile
>   add editorconfig
>
>  .editorconfig         | 15 +++++++++++++++
>  scripts/git.orderfile | 29 +++++++++++++++++++++++++++++
>  2 files changed, 44 insertions(+)
>  create mode 100644 .editorconfig
>  create mode 100644 scripts/git.orderfile

Applied, thanks.

-- PMM