From: sean <seanlkml@sympatico.ca>
Date: Sat, 11 Mar 2006 07:39:28 +0000 (-0500)
Subject: annotate.perl triggers rpm bug
X-Git-Tag: v1.3.0-rc1~21^2~15
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=be767c91724275c4534965c0d25c452b76057602;p=git.git

annotate.perl triggers rpm bug

RPM, at least on Fedora boxes, automatically creates a
dependency for any perl "use" lines, and one of the help text
lines unfortunately begins like this:

    -S, --rev-file revs-file
            use revs from revs-file instead of calling git-rev-list

RPM gets confused and creates a false dependecy for the
nonexistent perl package "revs".  Obviously this creates a
problem when someone goes to install the git-core rpm.

Since other help sentences all start with capital letter, make
this one match them by upcasing "Use".  As a side effect, RPM
stops getting confused.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-annotate.perl b/git-annotate.perl
index feea0a2d..9df72a16 100755
--- a/git-annotate.perl
+++ b/git-annotate.perl
@@ -20,7 +20,7 @@ sub usage() {
 	-r, --rename
 			Follow renames (Defaults on).
 	-S, --rev-file revs-file
-			use revs from revs-file instead of calling git-rev-list
+			Use revs from revs-file instead of calling git-rev-list
 	-h, --help
 			This message.
 ';