From 5d4e319725a7eeedee42e25b0485dae6943d41c6 Mon Sep 17 00:00:00 2001
From: Motonori Iwata <iwata.motonori@dena.jp>
Date: Mon, 5 Sep 2011 17:34:42 +0900
Subject: [PATCH] add grep options

---
 git-now-grep | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/git-now-grep b/git-now-grep
index a070fb3..f562023 100644
--- a/git-now-grep
+++ b/git-now-grep
@@ -1,5 +1,5 @@
 usage() {
-  echo "usage: git now grep [<base-branch>]"
+  echo "usage: git now grep [--patch|-p] [--stat|-s] [<base-branch>]"
 }
 
 cmd_default() {
@@ -8,18 +8,27 @@ cmd_default() {
   if [ -n "$BASE_BRANCH" ]; then
     WORKING_BRANCH=$(git_current_branch)
     COMMON_ANCESTOR_COMMIT=`git merge-base ${BASE_BRANCH} ${WORKING_BRANCH}`
-    echo `git log ${COMMON_ANCESTOR_COMMIT}.. --pretty=oneline --grep="${PREFIX}"`
+    git log${ARGS} ${COMMON_ANCESTOR_COMMIT}.. --pretty=format:"%h - %an, %ar : %s" --grep="${PREFIX}"
   else
-    echo `git log --pretty=oneline --grep="${PREFIX}"`
+    git log${ARGS} --pretty=format:"%h - %an, %ar : %s" --grep="${PREFIX}"
   fi
 }
 
 parse_args() {
   # parse options
+  DEFINE_boolean 'patch' false 'generate diff in patch format' 'p'
+  DEFINE_boolean 'stat' false 'generate diffstat instead of patch' 's'
   FLAGS "$@" || exit $?
   eval set -- "${FLAGS_ARGV}"
   # read arguments into global variables
   BASE_BRANCH=$1
+  ARGS=
+  if flag patch; then
+    ARGS="${ARGS} -p"
+  fi
+  if flag stat; then
+    ARGS="${ARGS} --stat"
+  fi
 }
 
 cmd_help() {