linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Howells <dhowells@redhat.com>
To: catalin.marinas@arm.com
Cc: dhowells@redhat.com,
	Linus Torvalds <torvalds@linux-foundation.org>,
	akpm@linux-foundation.org, sam@ravnborg.org,
	linux-kernel@vger.kernel.org
Subject: Fix for StGIT
Date: Fri, 10 Apr 2009 00:24:41 +0100	[thread overview]
Message-ID: <13288.1239319481@redhat.com> (raw)
In-Reply-To: <alpine.LFD.2.00.0904091458330.4583@localhost.localdomain>


Hi Catalin,

I think StGIT needs something like the attached patch to get it to generate
patches with renames in them correctly.  This isn't quite right, since it
doesn't pass the file list to git-diff-tree, but I can't work out how to make
the python do it:-/

David
---
diff -c /usr/lib/python2.5/site-packages/stgit/git.py.old /usr/lib/python2.5/site-packages/stgit/git.py
--- /usr/lib/python2.5/site-packages/stgit/git.py.old	2008-06-08 23:26:03.000000000 +0100
+++ /usr/lib/python2.5/site-packages/stgit/git.py	2009-04-10 00:17:58.000000000 +0100
@@ -820,8 +820,8 @@
 # usually invoke git.diff() form the calling functions
 def diffstat(files = None, rev1 = 'HEAD', rev2 = None):
     """Return the diffstat between rev1 and rev2."""
-    return GRun('apply', '--stat', '--summary'
-                ).raw_input(diff(files, rev1, rev2)).raw_output()
+    return GRun('diff-tree', '-M', '--stat', '--summary', rev1, rev2
+                ).raw_output()
 
 def files(rev1, rev2, diff_flags = []):
     """Return the files modified between rev1 and rev2

      parent reply	other threads:[~2009-04-09 23:26 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-09 16:32 [PATCH 1/2] FRV: Use <asm-generic/pgtable.h> in NOMMU mode David Howells
2009-04-09 16:33 ` [PATCH 2/2] FRV: Move to arch/frv/include/asm/ David Howells
2009-04-09 17:51   ` Linus Torvalds
2009-04-09 18:04     ` Linus Torvalds
2009-04-09 18:13     ` Al Viro
2009-04-09 18:26       ` Linus Torvalds
2009-04-09 18:39         ` Al Viro
2009-04-09 18:28       ` patch(1) and git -M output (Re: [PATCH 2/2] FRV: Move to arch/frv/include/asm/) Al Viro
2009-04-09 22:06         ` Andreas Gruenbacher
2009-04-09 23:21           ` Al Viro
2009-04-09 21:05   ` [PATCH 2/2] FRV: Move to arch/frv/include/asm/ David Howells
2009-04-09 21:18     ` Linus Torvalds
2009-04-09 21:23       ` Randy Dunlap
2009-04-09 21:51     ` David Howells
2009-04-09 22:00       ` Linus Torvalds
2009-04-09 23:24       ` David Howells [this message]

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=13288.1239319481@redhat.com \
    --to=dhowells@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=catalin.marinas@arm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sam@ravnborg.org \
    --cc=torvalds@linux-foundation.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).