Skip to content

Commit

Permalink
add a quiet option to git-checkout
Browse files Browse the repository at this point in the history
Those new messages are certainly nice, but there might be cases where
they are simply unwelcome, like when git-commit is used within scripts.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Nicolas Pitre authored and Junio C Hamano committed Feb 2, 2007
1 parent 92cf956 commit 6124aee
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 10 deletions.
5 changes: 4 additions & 1 deletion Documentation/git-checkout.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ git-checkout - Checkout and switch to a branch
SYNOPSIS
--------
[verse]
'git-checkout' [-f] [-b <new_branch> [-l]] [-m] [<branch>]
'git-checkout' [-q] [-f] [-b <new_branch> [-l]] [-m] [<branch>]
'git-checkout' [<tree-ish>] <paths>...

DESCRIPTION
Expand All @@ -33,6 +33,9 @@ working tree.

OPTIONS
-------
-q::
Quiet, supress feedback messages.

-f::
Force a re-read of everything.

Expand Down
23 changes: 14 additions & 9 deletions git-checkout.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

USAGE='[-f] [-b <new_branch>] [-m] [<branch>] [<paths>...]'
USAGE='[-q] [-f] [-b <new_branch>] [-m] [<branch>] [<paths>...]'
SUBDIRECTORY_OK=Sometimes
. git-sh-setup
require_work_tree
Expand All @@ -15,6 +15,7 @@ branch=
newbranch=
newbranch_log=
merge=
quiet=
LF='
'
while [ "$#" != "0" ]; do
Expand All @@ -40,6 +41,9 @@ while [ "$#" != "0" ]; do
-m)
merge=1
;;
"-q")
quiet=1
;;
--)
break
;;
Expand Down Expand Up @@ -153,7 +157,7 @@ detach_warn=
if test -z "$branch$newbranch" && test "$new" != "$old"
then
detached="$new"
if test -n "$oldbranch"
if test -n "$oldbranch" && test -z "$quiet"
then
detach_warn="Note: moving to \"$new_name\" which isn't a local branch
If you want to create a new branch from this checkout, you may do so
Expand All @@ -180,8 +184,11 @@ fi

if [ "X$old" = X ]
then
echo >&2 "warning: You appear to be on a branch yet to be born."
echo >&2 "warning: Forcing checkout of $new_name."
if test -z "$quiet"
then
echo >&2 "warning: You appear to be on a branch yet to be born."
echo >&2 "warning: Forcing checkout of $new_name."
fi
force=1
fi

Expand Down Expand Up @@ -226,7 +233,7 @@ else
exit 0
)
saved_err=$?
if test "$saved_err" = 0
if test "$saved_err" = 0 && test -z "$quiet"
then
git diff-index --name-status "$new"
fi
Expand All @@ -251,11 +258,9 @@ if [ "$?" -eq 0 ]; then
if test -n "$branch"
then
GIT_DIR="$GIT_DIR" git-symbolic-ref HEAD "refs/heads/$branch"
if test -n "$newbranch"
if test -z "$quiet"
then
echo >&2 "Switched to a new branch \"$branch\""
else
echo >&2 "Switched to branch \"$branch\""
echo >&2 "Switched to${newbranch:+ a new} branch \"$branch\""
fi
elif test -n "$detached"
then
Expand Down

0 comments on commit 6124aee

Please sign in to comment.