summaryrefslogtreecommitdiff
path: root/git-bisect.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-04-12 15:41:19 -0700
committerJunio C Hamano <gitster@pobox.com>2008-04-12 15:41:19 -0700
commitd6d96f835cace1c108100cf88e216a59debcb937 (patch)
treef5d347de6193849ad4cec2b52d35e225d9c1e9e9 /git-bisect.sh
parenteed81838f0d0e031702473e1d427d71055134edd (diff)
parente80950786c16e642be76976a8926b2846ba0aa4f (diff)
downloadgit-d6d96f835cace1c108100cf88e216a59debcb937.tar.gz
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4: Docs gitk: Explicitly mention the files that gitk uses (~/.gitk) Document -w option to shortlog bisect: report bad rev better
Diffstat (limited to 'git-bisect.sh')
-rwxr-xr-xgit-bisect.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-bisect.sh b/git-bisect.sh
index 6644b10e36..5177a2a114 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -155,9 +155,9 @@ bisect_state() {
shift
for rev in "$@"
do
- rev=$(git rev-parse --verify "$rev^{commit}") ||
+ sha=$(git rev-parse --verify "$rev^{commit}") ||
die "Bad rev input: $rev"
- bisect_write "$state" "$rev"
+ bisect_write "$state" "$sha"
done ;;
*,bad)
die "'git bisect bad' can take only one argument." ;;