public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Jonas Fonseca <fonseca@diku•dk>
To: Petr Baudis <pasky@ucw•cz>
Cc: git@vger•kernel.org
Subject: [PATCH 9/10] Move file matching inside the loop.
Date: Sat, 4 Jun 2005 16:43:06 +0200	[thread overview]
Message-ID: <20050604144306.GM12615@diku.dk> (raw)
In-Reply-To: <20050604143831.GD12615@diku.dk>

Handling of -f is done inide the loop so no extra git-cat-file call is
necessary. Store file arguments to cg-log in an array to make them easier
to access from print_commit_log().

Signed-off-by: Jonas Fonseca <fonseca@diku•dk>
---

 cg-log |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cg-log b/cg-log
--- a/cg-log
+++ b/cg-log
@@ -73,6 +73,7 @@ log_start=
 log_end=
 user=
 mergebase=
+files=()
 
 while [ "$1" ]; do
 	case "$1" in
@@ -107,6 +108,7 @@ while [ "$1" ]; do
 		mergebase=1
 		;;
 	*)
+		files=("$@")
 		break
 		;;
 	esac
@@ -184,6 +186,12 @@ print_commit_log() {
 				parents[${#parents[@]}]="$rest"
 				;;
 			"")
+				if [ "$files" ]; then
+					parent="${parents[0]}"
+					diff_ops=
+					[ "$parent" ] || diff_ops=--root
+					[ "$(git-diff-tree -r $diff_ops $commit $parent "${files[@]}")" ] || return 1
+				fi
 				if [ "$user" ]; then
 					echo -e "author $author\ncommitter $committer" \
 						| grep -qi "$user" || return
@@ -221,12 +229,6 @@ print_commit_log() {
 $revls | $revsort | while read time commit parents; do
 	trap exit SIGPIPE
 	[ "$revfmt" = "git-rev-list" ] && commit="$time"
-	if [ $# -ne 0 ]; then
-		parent=$(git-cat-file commit $commit | sed -n '2s/parent //p;2Q')
-		diff_ops=
-		[ "$parent" ] || diff_ops=--root
-		[ "$(git-diff-tree -r $diff_ops $commit $parent "$@")" ] || continue
-	fi
 	log="$(print_commit_log $commit)"
 	if [ "$log" ]; then
 		echo "$log"
-- 
Jonas Fonseca

next prev parent reply	other threads:[~2005-06-04 14:39 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-06-04 14:38 [PATCHSET] cg-log cleanups and enhancements Jonas Fonseca
2005-06-04 14:39 ` [PATCH 1/10] Cleanup conversion to human readable date Jonas Fonseca
2005-06-04 14:39 ` [PATCH 2/10] Separate handling of tree and parent in commit headers Jonas Fonseca
2005-06-04 14:40 ` [PATCH 3/10] Separate handling of author and committer " Jonas Fonseca
2005-06-04 14:40 ` [PATCH 4/10] First parse all commit header entries then print them Jonas Fonseca
2005-06-04 14:41 ` [PATCH 5/10] Move printing of the commit info line inside the loop Jonas Fonseca
2005-06-04 14:41 ` [PATCH 6/10] Remove the catch all rule Jonas Fonseca
2005-06-04 14:42 ` [PATCH 7/10] Move log printing to separate function Jonas Fonseca
2005-06-04 14:42 ` [PATCH 8/10] Move the username matching inside the loop Jonas Fonseca
2005-06-04 14:43 ` Jonas Fonseca [this message]
2005-06-04 14:43 ` [PATCH 10/10] Add -s option to show log summary Jonas Fonseca

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20050604144306.GM12615@diku.dk \
    --to=fonseca@diku$(echo .)dk \
    --cc=git@vger$(echo .)kernel.org \
    --cc=pasky@ucw$(echo .)cz \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox