summaryrefslogtreecommitdiff
path: root/git-bisect.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-04-12 19:17:51 -0700
committerJunio C Hamano <gitster@pobox.com>2008-04-12 19:17:51 -0700
commitf43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f (patch)
treeb29df95a9ea15dc54263921f63077c62058d6c22 /git-bisect.sh
parenta53f2ec617ba36a67bf8794d28d666d45ce374a6 (diff)
parent02604e293a3b7d48b0ce4e34149de8dc89c674e5 (diff)
downloadgit-f43e2fd43b50d5a82a34bb3e4f848cb38bf93b7f.tar.gz
Merge branch 'maint'
* maint: t7401: squelch garbage output Documentation/git-submodule: typofix Fix config key miscount in url.*.insteadOf 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 ff904e60d9..408775a51e 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -159,9 +159,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." ;;