X-Git-Url: http://git.shiar.net/git-grep-footer.git/blobdiff_plain/fd7e377bdab3b1d3d586099aba9f8dc28d0d4040..63fe72b852e760e8fc525f0c65f75e667800fb38:/git-grep-footer

diff --git a/git-grep-footer b/git-grep-footer
index 6f20fac..fd2afe2 100755
--- a/git-grep-footer
+++ b/git-grep-footer
@@ -9,6 +9,7 @@ use Getopt::Long qw(:config bundling);
 
 GetOptions(\my %opt,
 	'debug!',
+	'',  # stdin
 	'count|c!',
 	'simplify|s:s',
 	'ignore-case|i!',
@@ -16,11 +17,17 @@ GetOptions(\my %opt,
 	'grep|S=s',
 	'min|min-count|unique|u:i',
 	'max|max-count|show|n:i',
+	'hash|H!',
 	'version|V'  => sub { Getopt::Long::VersionMessage() },
 	'usage|h'    => sub { Getopt::Long::HelpMessage() },
 	'help|man|?' => sub { Getopt::Long::HelpMessage(-verbose => 2) },
 ) or exit 129;
 
+my $inputstream = $opt{''} ? \*ARGV : eval {
+	require Git;
+	Git::command_output_pipe('log', '-z', '--pretty=format:%h%n%b', @ARGV);
+} || die "Automatic git log failed: $@";
+
 local $| = 1;
 local $/ = "\0";
 
@@ -28,9 +35,9 @@ my $HEADERMATCH = qr/ [a-z]+ (?: (?:-\w+)+ | \ by ) | cc | reference /ix;
 
 my (%headercount, @headercache);
 
-while (readline) {
-	s/^([0-9a-f]{4,40})\n//m and
-	my $hash = $1;
+while (readline $inputstream) {
+	s/^([0-9a-f]{4,40})\n//m;
+	my $hash = $opt{hash} ? $1 : undef;
 
 	# strip commit seperator
 	chomp;
@@ -41,8 +48,6 @@ while (readline) {
 	# if invalid, assume it's latin1
 	       $_ = decode(cp1252 => $_) if $@;
 
-	my %attr;
-
 	BLOCK:
 	for (reverse split /\n\n/) {
 		my @headers;
@@ -159,7 +164,9 @@ git-grep-footer - Find custom header lines in commit messages
 
 =head1 SYNOPSIS
 
-F<git> log --pretty=%b%x00 | F<git-grep-footer> [OPTIONS]
+F<git-grep-footer> [OPTIONS] [-- <git log options>]
+
+F<git> log -z --pretty=format:%b | F<git-grep-footer> [OPTIONS] -
 
 =head1 DESCRIPTION
 
@@ -226,15 +233,19 @@ Additional samples are optionally given upto the given maximum.
 Prefixes (unique) lines by the number of occurrences.
 Causes output to be buffered until all input has been read (obviously).
 
+=item -H, --hash
+
+Prefixes the SHA1 hash of the (or a) matching commit.
+
 =back
 
 =head1 EXAMPLES
 
 =over
 
-=item git-grep-footer --grep=^ack
+=item git-grep-footer --grep=^ack v2.6.32..v2.6.33
 
-Search for Acked-by lines.
+Search for I<Acked-by> lines for version I<v2.6.33>.
 Append C<-uin> to skip reoccurrences.
 
 =item git-grep-footer -u --grep=junio
@@ -249,9 +260,9 @@ Compare various capitalisations and (mis)spellings of signoffs.
 
 List the ten most frequently used attribute names.
 
-=item git-grep-footer -n2 -i -s
+=item git-grep-footer -n2 -i -s --hash -- --reverse
 
-Upto two examples for each distinct identifier.
+The earliest two usages of each distinct identifier.
 
 =back
 
@@ -261,5 +272,7 @@ Mischa POSLAWSKY <perl@shiar.org>
 
 =head1 LICENSE
 
-Copyright. All rights reserved.
+This software is free software;
+you can redistribute and/or modify it under the terms of the GNU GPL
+version 2 or later.