summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-10-28 11:21:46 -0700
committerJunio C Hamano <gitster@pobox.com>2009-10-28 11:21:46 -0700
commitcd0f8e6d63d3e2744d7d3b2329238be7d064a8ea (patch)
tree1dec0df37dae5154604064c4c8a8b50e90058a16 /git-rebase--interactive.sh
parentc1e01b0c5106451770ae77a62f52acfe814c3326 (diff)
parent7c3baa9abf0abe15f068d95688bbc27e73a69042 (diff)
downloadgit-cd0f8e6d63d3e2744d7d3b2329238be7d064a8ea.tar.gz
Merge branch 'maint'
* maint: help -a: do not unnecessarily look for a repository Do not try to remove directories when removing old links rebase -i: more graceful handling of invalid commands help -i: properly error out if no info viewer can be found
Diffstat (limited to 'git-rebase--interactive.sh')
-rwxr-xr-xgit-rebase--interactive.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index a1879e3ace..53ad248ee5 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -416,7 +416,12 @@ do_next () {
;;
*)
warn "Unknown command: $command $sha1 $rest"
- die_with_patch $sha1 "Please fix this in the file $TODO."
+ if git rev-parse --verify -q "$sha1" >/dev/null
+ then
+ die_with_patch $sha1 "Please fix this in the file $TODO."
+ else
+ die "Please fix this in the file $TODO."
+ fi
;;
esac
test -s "$TODO" && return