Skip to content
Permalink
Browse files
Fix Bug 14403: prepare-ChangeLog --git-commit doesn't support --diff
http://bugs.webkit.org/show_bug.cgi?id=14403

Reviewed by Mark Rowe.

* Scripts/prepare-ChangeLog: Don't spew to stdout, use stderr instead.
(sub createPatchCommand): Generate a correct diff in the $gitCommit
case.


Canonical link: https://commits.webkit.org/18561@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@23778 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
aroben committed Jun 26, 2007
1 parent d2f29a5 commit 0618d4b4259c79eb2ead56bed3e6e7d5dba1d0b5
Showing with 13 additions and 1 deletion.
  1. +11 −0 WebKitTools/ChangeLog
  2. +2 −1 WebKitTools/Scripts/prepare-ChangeLog
@@ -1,3 +1,14 @@
2007-06-25 Adam Roben <aroben@apple.com>

Fix Bug 14403: prepare-ChangeLog --git-commit doesn't support --diff
http://bugs.webkit.org/show_bug.cgi?id=14403

Reviewed by Mark Rowe.

* Scripts/prepare-ChangeLog: Don't spew to stdout, use stderr instead.
(sub createPatchCommand): Generate a correct diff in the $gitCommit
case.

2007-06-25 Adam Roben <aroben@apple.com>

Land pdevenv and supporting scripts/programs
@@ -303,7 +303,7 @@ foreach my $prefix (sort keys %files) {
}

if (!$reviewer) {
print "WARNING!!! Change was not reviewed!\n";
print STDERR "WARNING!!! Change was not reviewed!\n";
$reviewer = "NOBODY (OO" . "PS!)";
}

@@ -961,6 +961,7 @@ sub createPatchCommand($)
my ($changedFilesString) = @_;

return "'$FindBin::Bin/svn-create-patch' $changedFilesString" if isSVN();
return "$GIT diff -C -M \"$gitCommit^\" \"$gitCommit\"" if $gitCommit;
return "$GIT diff -C -M HEAD -- $changedFilesString" if isGit();
}

0 comments on commit 0618d4b

Please sign in to comment.