[PATCH 1/3] Make git-branch honor -v when showing remote branches
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
git-branch.sh | 74 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 47 insertions(+), 27 deletions(-)
diff --git a/git-branch.sh b/git-branch.sh
index ab58737..25abd4c 100755
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-USAGE='[-l] [(-d | -D) <branchname>] | [[-f] <branchname> [<start-point>]] | -r | -v'
+USAGE='[-r] [-v] | (-d | -D) <branchname> | [-l] [-f] <branchname> [<start-point>]'
LONG_USAGE='If no arguments, show available branches and mark current branch with a star.
If one argument, create a new branch <branchname> based off of current HEAD.
If two arguments, create a new branch <branchname> based off of <start-point>.'
@@ -48,15 +48,48 @@ If you are sure you want to delete it, r
exit 0
}
-ls_remote_branches () {
- git-rev-parse --symbolic --all |
- sed -ne 's|^refs/\(remotes/\)|\1|p' |
- sort
-}
-
force=
create_log=
verbose=
+remotes=
+
+ls_remote_branches () {
+ git-rev-parse --symbolic --all |
+ sed -ne 's|^refs/\(remotes/\)|\1|p' |
+ sort |
+ while read ref
+ do
+ if test "$verbose" = "yes"
+ then
+ log=$(git-log --max-count=1 --pretty=oneline $ref)
+ printf "%-20s %s\n" "$ref" "$log"
+ else
+ echo "$ref"
+ fi
+ done
+}
+
+ls_local_branches() {
+ git-rev-parse --symbolic --branches |
+ sort |
+ while read ref
+ do
+ if test "$headref" = "$ref"
+ then
+ pfx='*'
+ else
+ pfx=' '
+ fi
+ if test "$verbose" = "yes"
+ then
+ log=$(git-log --max-count=1 --pretty=oneline $ref)
+ printf "%s %-20s %s\n" "$pfx" "$ref" "$log"
+ else
+ echo "$pfx $ref"
+ fi
+ done
+}
+
while case "$#,$1" in 0,*) break ;; *,-*) ;; *) break ;; esac
do
case "$1" in
@@ -65,8 +98,7 @@ do
exit
;;
-r)
- ls_remote_branches
- exit
+ remotes="yes"
;;
-f)
force="$1"
@@ -90,24 +122,12 @@ done
case "$#" in
0)
- git-rev-parse --symbolic --branches |
- sort |
- while read ref
- do
- if test "$headref" = "$ref"
- then
- pfx='*'
- else
- pfx=' '
- fi
- if test "$verbose" = "yes"
- then
- log=$(git-log --max-count=1 --pretty=oneline $ref)
- printf "%s %-20s %s\n" "$pfx" "$ref" "$log"
- else
- echo "$pfx $ref"
- fi
- done
+ if test "$remotes" = "yes"
+ then
+ ls_remote_branches
+ else
+ ls_local_branches
+ fi
exit 0 ;;
1)
head=HEAD ;;
--
1.4.3.1