Title: [207416] trunk/Tools
- Revision
- 207416
- Author
- commit-qu...@webkit.org
- Date
- 2016-10-17 10:59:17 -0700 (Mon, 17 Oct 2016)
Log Message
resolve-ChangeLogs: Specify --no-page to git diff
https://bugs.webkit.org/show_bug.cgi?id=163441
Patch by Fujii Hironori <hironori.fu...@sony.com> on 2016-10-17
Reviewed by Darin Adler.
resolve-ChangeLogs shows the result after resolving by invoking
'git diff'. It runs a pager for every ChangeLog if it is under
TTY.
* Scripts/resolve-ChangeLogs:
(showStatus): Specify '--no-page' to git diff.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (207415 => 207416)
--- trunk/Tools/ChangeLog 2016-10-17 17:59:04 UTC (rev 207415)
+++ trunk/Tools/ChangeLog 2016-10-17 17:59:17 UTC (rev 207416)
@@ -1,3 +1,17 @@
+2016-10-17 Fujii Hironori <hironori.fu...@sony.com>
+
+ resolve-ChangeLogs: Specify --no-page to git diff
+ https://bugs.webkit.org/show_bug.cgi?id=163441
+
+ Reviewed by Darin Adler.
+
+ resolve-ChangeLogs shows the result after resolving by invoking
+ 'git diff'. It runs a pager for every ChangeLog if it is under
+ TTY.
+
+ * Scripts/resolve-ChangeLogs:
+ (showStatus): Specify '--no-page' to git diff.
+
2016-10-17 Michael Catanzaro <mcatanz...@igalia.com>
Move user agent quirks to cross-platform location
Modified: trunk/Tools/Scripts/resolve-ChangeLogs (207415 => 207416)
--- trunk/Tools/Scripts/resolve-ChangeLogs 2016-10-17 17:59:04 UTC (rev 207415)
+++ trunk/Tools/Scripts/resolve-ChangeLogs 2016-10-17 17:59:17 UTC (rev 207416)
@@ -487,7 +487,7 @@
} elsif ($isGit) {
my @args = qw(--name-status);
unshift @args, qw(--cached) if $isConflictResolved;
- system($GIT, "diff", @args, $file);
+ system($GIT, "--no-pager", "diff", @args, $file);
} else {
die "Unknown version control system";
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
