diff options
Diffstat (limited to 'Tools/Scripts/prepare-ChangeLog')
| -rwxr-xr-x | Tools/Scripts/prepare-ChangeLog | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/Tools/Scripts/prepare-ChangeLog b/Tools/Scripts/prepare-ChangeLog index 2fc03d2..b5e2efe 100755 --- a/Tools/Scripts/prepare-ChangeLog +++ b/Tools/Scripts/prepare-ChangeLog @@ -117,7 +117,7 @@ my $parseOptionsResult = "name:s" => \$name, "email:s" => \$emailAddress, "merge-base:s" => \$mergeBase, - "git-commit:s" => \$gitCommit, + "git-commit|g:s" => \$gitCommit, "git-index" => \$gitIndex, "git-reviewer:s" => \$gitReviewer, "help|h!" => \$showHelp, @@ -125,18 +125,18 @@ my $parseOptionsResult = "write!" => \$writeChangeLogs, "update!" => \$updateChangeLogs); if (!$parseOptionsResult || $showHelp) { - print STDERR basename($0) . " [-b|--bug=<bugid>] [-d|--diff] [-h|--help] [-o|--open] [--git-commit=<committish>] [--git-reviewer=<name>] [svndir1 [svndir2 ...]]\n"; - print STDERR " -b|--bug Fill in the ChangeLog bug information from the given bug.\n"; - print STDERR " -d|--diff Spew diff to stdout when running\n"; - print STDERR " --merge-base Populate the ChangeLogs with the diff to this branch\n"; - print STDERR " --git-commit Populate the ChangeLogs from the specified git commit\n"; - print STDERR " --git-index Populate the ChangeLogs from the git index only\n"; - print STDERR " --git-reviewer When populating the ChangeLogs from a git commit claim that the spcified name reviewed the change.\n"; - print STDERR " This option is useful when the git commit lacks a Signed-Off-By: line\n"; - print STDERR " -h|--help Show this help message\n"; - print STDERR " -o|--open Open ChangeLogs in an editor when done\n"; - print STDERR " --[no-]update Update ChangeLogs from svn before adding entry (default: update)\n"; - print STDERR " --[no-]write Write ChangeLogs to disk (otherwise send new entries to stdout) (default: write)\n"; + print STDERR basename($0) . " [-b|--bug=<bugid>] [-d|--diff] [-h|--help] [-o|--open] [-g|--git-commit=<committish>] [--git-reviewer=<name>] [svndir1 [svndir2 ...]]\n"; + print STDERR " -b|--bug Fill in the ChangeLog bug information from the given bug.\n"; + print STDERR " -d|--diff Spew diff to stdout when running\n"; + print STDERR " --merge-base Populate the ChangeLogs with the diff to this branch\n"; + print STDERR " -g|--git-commit Populate the ChangeLogs from the specified git commit\n"; + print STDERR " --git-index Populate the ChangeLogs from the git index only\n"; + print STDERR " --git-reviewer When populating the ChangeLogs from a git commit claim that the spcified name reviewed the change.\n"; + print STDERR " This option is useful when the git commit lacks a Signed-Off-By: line\n"; + print STDERR " -h|--help Show this help message\n"; + print STDERR " -o|--open Open ChangeLogs in an editor when done\n"; + print STDERR " --[no-]update Update ChangeLogs from svn before adding entry (default: update)\n"; + print STDERR " --[no-]write Write ChangeLogs to disk (otherwise send new entries to stdout) (default: write)\n"; exit 1; } @@ -319,7 +319,7 @@ foreach my $prefix (keys %files) { $sortKey = "-, just after top level"; } elsif ($prefixDir eq "WebBrowser") { $sortKey = lc "WebKit, WebBrowser after"; - } elsif ($prefixDir eq "WebCore") { + } elsif ($prefixDir eq "Source/WebCore") { $sortKey = lc "WebFoundation, WebCore after"; } elsif ($prefixDir eq "LayoutTests") { $sortKey = lc "~, LayoutTests last"; |