This makes git-branch display sha1 and first line of commit
message for each branch.
Additionaly, the -w option may be used to specify columnwidth
for branchname (default is 20 characters)
Signed-off-by: Lars Hjemli <hjemli@xxxxxxxxx>
---
Documentation/git-branch.txt | 8 ++++++-
git-branch.sh | 47 ++++++++++++++++++++++++++++++++++++-----
2 files changed, 48 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index d43ef1d..efbab61 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -8,7 +8,7 @@ git-branch - List, create, or delete bra
SYNOPSIS
--------
[verse]
-'git-branch' [-r]
+'git-branch' [-r] [-v [-w width]]
'git-branch' [-l] [-f] <branchname> [<start-point>]
'git-branch' (-d | -D) <branchname>...
@@ -47,6 +47,12 @@ OPTIONS
-r::
List only the "remote" branches.
+-v::
+ Show sha1 and first line of commit message for each branch
+
+-w <width>::
+ Set columnwidth for branchname display
+
<branchname>::
The name of the branch to create or delete.
The new branch name must pass all checks defined by
diff --git a/git-branch.sh b/git-branch.sh
index 1f628a4..73839b4 100755
--- a/git-branch.sh
+++ b/git-branch.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-USAGE=' [-l] [-f] <branchname> [<start-point>] | (-d | -D) <branchname> | [-r]'
+USAGE=' [-l] [-f] <branchname> [<start-point>] | (-d | -D) <branchname> | [-r] [-v [-w width]]'
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>.'
@@ -49,12 +49,26 @@ If you are sure you want to delete it, r
}
ls_remote_branches () {
+ verbose="$1"
+ width="$2"
git-rev-parse --symbolic --all |
sed -ne 's|^refs/\(remotes/\)|\1|p' |
- sort
+ sort |
+ while read ref
+ do
+ if test "$verbose" = "yes"
+ then
+ log=$(git-log --pretty=oneline --max-count=1 "$ref")
+ printf "%-*s %s\n" "$width" "$ref" "$log"
+ else
+ echo "$ref"
+ fi
+ done
}
ls_local_branches () {
+ verbose="$1"
+ width="$2"
git-rev-parse --symbolic --branches |
sort |
while read ref
@@ -65,12 +79,22 @@ ls_local_branches () {
else
pfx=' '
fi
- echo "$pfx $ref"
+ if test "$verbose" = "yes"
+ then
+ log=$(git-log --pretty=oneline --max-count=1 "$ref")
+ printf "%s %-*s %s\n" "$pfx" "$width" "$ref" "$log"
+ else
+ echo "$pfx $ref"
+ fi
done
}
force=
create_log=
+remotes=
+verbose=
+width=20
+
while case "$#,$1" in 0,*) break ;; *,-*) ;; *) break ;; esac
do
case "$1" in
@@ -79,8 +103,14 @@ do
exit
;;
-r)
- ls_remote_branches
- exit
+ remotes="yes"
+ ;;
+ -v)
+ verbose="yes"
+ ;;
+ -w)
+ shift
+ width="$1"
;;
-f)
force="$1"
@@ -101,7 +131,12 @@ done
case "$#" in
0)
- ls_local_branches
+ if test "$remotes" = "yes"
+ then
+ ls_remote_branches "$verbose" "$width"
+ else
+ ls_local_branches "$verbose" "$width"
+ fi
exit 0 ;;
1)
head=HEAD ;;
--
1.4.3.1.g1688
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html