A few weeks ago there was a bug report that some invalid commands
produced confusing error messages. The fix could have made things
simpler. There's no need for die_with_patch in this case, because its
purpose is to tell rerere and a future rebase --continue about a
commit that we just attempted, and we didn't attempt any commit. So
just use a plain "die" unconditionally.
Signed-off-by: Greg Price <price@mit.edu>
---
git-rebase--interactive.sh | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 53ad248..6d0ca7b 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -416,12 +416,7 @@ do_next () {
;;
*)
warn "Unknown command: $command $sha1 $rest"
- 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
+ die "Please fix this in the file $TODO."
;;
esac
test -s "$TODO" && return
--
1.6.5.2.27.g906c6.dirty
--
