Changeset 207416 in webkit

Timestamp:

Oct 17, 2016 10:59:17 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

resolve-ChangeLogs: Specify --no-page to git diff
​https://bugs.webkit.org/show_bug.cgi?id=163441

Patch by Fujii Hironori <Fujii Hironori> 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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/resolve-ChangeLogs (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-10-17  Fujii Hironori  <Hironori.Fujii@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  <mcatanzaro@igalia.com>
 

trunk/Tools/Scripts/resolve-ChangeLogs

@@ -488 +488 @@
         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";