2010-11-17 Dirk Pranke <dpranke@chromium.org>

        Reviewed by Andreas Kling.

        webkit-patch pretty-diff shouldn't need to be run from a checkout root in git
        https://bugs.webkit.org/show_bug.cgi?id=49639

        * Scripts/webkitpy/common/checkout/scm.py:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72263 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 663f551bc97a08419d6a4c713e8cce7e169f4646..0f636b3ee1751a43ffb951c768619a3be049b9fe 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-17  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Andreas Kling.
+
+        webkit-patch pretty-diff shouldn't need to be run from a checkout root in git
+        https://bugs.webkit.org/show_bug.cgi?id=49639
+
+        * Scripts/webkitpy/common/checkout/scm.py:
+
 2010-11-17  Mihai Parparita  <mihaip@chromium.org>
 
         Reviewed by Tony Chang.

diff --git a/WebKitTools/Scripts/webkitpy/common/checkout/scm.py b/WebKitTools/Scripts/webkitpy/common/checkout/scm.py
index 8aadcb87c2755c551745f18ae169c88f0263850a..11e82ace431bff3a6b3b5c2e44f202255181a4b4 100644 (file)
--- a/WebKitTools/Scripts/webkitpy/common/checkout/scm.py
+++ b/WebKitTools/Scripts/webkitpy/common/checkout/scm.py
@@ -700,8 +700,7 @@ class Git(SCM):
         """Returns a byte array (str()) representing the patch file.
         Patch files are effectively binary since they may contain
         files of multiple different encodings."""
-        # FIXME: This should probably use cwd=self.checkout_root
-        return self.run(['git', 'diff', '--binary', "--no-ext-diff", "--full-index", "-M", self.merge_base(git_commit), "--"] + changed_files, decode_output=False)
+        return self.run(['git', 'diff', '--binary', "--no-ext-diff", "--full-index", "-M", self.merge_base(git_commit), "--"] + changed_files, decode_output=False, cwd=self.checkout_root)
 
     def _run_git_svn_find_rev(self, arg):
         # git svn find-rev always exits 0, even when the revision or commit is not found.