From cd4f15f314cfaa74cd992c55fccd95bf5ce6cae0 Mon Sep 17 00:00:00 2001 From: Marcin Bachry Date: Sun, 17 May 2009 19:34:09 +0200 Subject: [PATCH] Explicitly disallow rewriting history from the first commit. * magit.el (magit-rewrite-start): Use magit-commit-parents to find base commit for rewrite and signal error if there isn't any. --- magit.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/magit.el b/magit.el index 2b1c1e49..d0ce8b26 100644 --- a/magit.el +++ b/magit.el @@ -2144,7 +2144,8 @@ in log buffer." (or (not (magit-read-rewrite-info)) (error "Rewrite in progress.")) (let* ((orig (magit-git-string "rev-parse HEAD")) - (base (magit-git-string "rev-parse %s^" from)) + (base (or (car (magit-commit-parents from)) + (error "Can't rewrite a commit without a parent, sorry."))) (pending (magit-git-lines "rev-list %s.." base))) (magit-write-rewrite-info `((orig ,orig) (pending ,@(mapcar #'list pending))))