Title: [127059] trunk/Tools
- Revision
- 127059
- Author
- commit-qu...@webkit.org
- Date
- 2012-08-29 15:47:43 -0700 (Wed, 29 Aug 2012)
Log Message
Fix check-webkit-style (and probably others) when WebKit is in a git submodule
https://bugs.webkit.org/show_bug.cgi?id=95177
Patch by Kevin Funk <kevin.f...@kdab.com> on 2012-08-29
Reviewed by Dirk Pranke.
Find the real checkout root by using 'git rev-parse --show-toplevel' instead of '--git-dir'
* Scripts/webkitpy/common/checkout/scm/git.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (127058 => 127059)
--- trunk/Tools/ChangeLog 2012-08-29 22:35:57 UTC (rev 127058)
+++ trunk/Tools/ChangeLog 2012-08-29 22:47:43 UTC (rev 127059)
@@ -1,3 +1,14 @@
+2012-08-29 Kevin Funk <kevin.f...@kdab.com>
+
+ Fix check-webkit-style (and probably others) when WebKit is in a git submodule
+ https://bugs.webkit.org/show_bug.cgi?id=95177
+
+ Reviewed by Dirk Pranke.
+
+ Find the real checkout root by using 'git rev-parse --show-toplevel' instead of '--git-dir'
+
+ * Scripts/webkitpy/common/checkout/scm/git.py:
+
2012-08-29 Dirk Pranke <dpra...@chromium.org>
webkit-patch rebaseline-expectations wrongly touches other platforms' TestExpectations
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py (127058 => 127059)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2012-08-29 22:35:57 UTC (rev 127058)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2012-08-29 22:47:43 UTC (rev 127059)
@@ -109,8 +109,7 @@
def find_checkout_root(self, path):
# "git rev-parse --show-cdup" would be another way to get to the root
- git_output = self._executive.run_command([self.executable_name, 'rev-parse', '--git-dir'], cwd=(path or "./"))
- (checkout_root, dot_git) = self._filesystem.split(git_output)
+ checkout_root = self._executive.run_command([self.executable_name, 'rev-parse', '--show-toplevel'], cwd=(path or "./")).strip()
if not self._filesystem.isabs(checkout_root): # Sometimes git returns relative paths
checkout_root = self._filesystem.join(path, checkout_root)
return checkout_root
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
