Title: [282562] trunk/Tools
- Revision
- 282562
- Author
- [email protected]
- Date
- 2021-09-16 11:08:14 -0700 (Thu, 16 Sep 2021)
Log Message
Allow use of --git-index and --git-commit at the same time when using with --only-files
https://bugs.webkit.org/show_bug.cgi?id=230328
Patch by Hoa Dinh <[email protected]> on 2021-09-16
Reviewed by Jonathan Bedard.
When specifying --git-index and --git-commit, it will compute the diff between the parent commit of the specified commit
and HEAD, including the current staged changes.
* Scripts/prepare-ChangeLog:
(main):
(diffFromToString):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (282561 => 282562)
--- trunk/Tools/ChangeLog 2021-09-16 18:07:01 UTC (rev 282561)
+++ trunk/Tools/ChangeLog 2021-09-16 18:08:14 UTC (rev 282562)
@@ -1,3 +1,17 @@
+2021-09-16 Hoa Dinh <[email protected]>
+
+ Allow use of --git-index and --git-commit at the same time when using with --only-files
+ https://bugs.webkit.org/show_bug.cgi?id=230328
+
+ Reviewed by Jonathan Bedard.
+
+ When specifying --git-index and --git-commit, it will compute the diff between the parent commit of the specified commit
+ and HEAD, including the current staged changes.
+
+ * Scripts/prepare-ChangeLog:
+ (main):
+ (diffFromToString):
+
2021-09-16 Tyler Wilcock <[email protected]> and Myles C. Maxfield <[email protected]>
font-weight should always serialize as a number
Modified: trunk/Tools/Scripts/prepare-ChangeLog (282561 => 282562)
--- trunk/Tools/Scripts/prepare-ChangeLog 2021-09-16 18:07:01 UTC (rev 282561)
+++ trunk/Tools/Scripts/prepare-ChangeLog 2021-09-16 18:08:14 UTC (rev 282562)
@@ -189,7 +189,7 @@
system "$FindBin::Bin/check-webkit-style";
}
- die "--git-commit and --git-index are incompatible." if ($gitIndex && $gitCommit);
+ die "--git-commit and --git-index are incompatible when not used with --only-files." if ($gitIndex && $gitCommit && !$onlyFiles);
isSVN() || isGit() || die "Couldn't determine your version control system.";
@@ -2068,6 +2068,7 @@
return "" if isSVN();
return $gitCommit if $gitCommit =~ m/.+\.\..+/;
+ return "--cached \"$gitCommit^\"" if $gitCommit && $gitIndex;
return "\"$gitCommit^\" \"$gitCommit\"" if $gitCommit;
return "--cached" if $gitIndex;
return $mergeBase if $mergeBase;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
