Now it'll ask you:
Rebase in progress. [A]bort, [S]kip, or [C]ontinue?
The message didn't indicate how you made the selction before.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
The Head section already tells us what commit we're on. Now this looks
like this:
Local: (detached) ~/g/git/
Head: c6b2a51 gettextize: git-clone "Cloning into" message
Rebasing: onto master (26 of 159)
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Fix the bug in magit-rebase-info that I introduced in 81bb2ba. Here's
the description of the bug from a message of mine to the mailing list:
I sent an incomplete fix for the "R" rebase method recently:
http://github.com/philjackson/magit/pull/59
But Phil pulled it in as-is:
81bb2ba2d3
Anyway, it needs a small fixup, this:
(length (magit-file-lines ".git/rebase-merge/git-rebase-todo.backup"))
Will be way off, because it'll count the (length) of lines like:
("pick cb925f0 check message..." "pick 2f811b6 take done length"
"pick 29332e6 use backup" "" "# Rebase 19e2dd7..29332e6 onto 19e2dd7"
"#" ...
What it should do instead so we can get the correct count is to only
count up until the "" (uninclusive) so the above example would return
3.
I couldn't find an idiomatic way of doing this in elisp, I could with
the (loop) macro, but that'd require cl.el.
As it turns out magit already needs cl.el, so I can just use (loop) to
fix this.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
When using the native Windows emacs build (not a cygwin build), but a cygwin
build of 'make', then make fails because we send unix-style paths using CURDIR
to emacs. If instead we use (expand-file-name "."), then emacs does the magic
for us.
I looked around and found that org-mode's Makefile does exactly this. It seems
like the right thing to do.
Prompts are now fed to magit-completing-read in a form that makes them look
ok if magit-completing-read-function is set directly to completing-read or
a compatible function instead of a Magit-specific wrapper.
Magit's "R" feature didn't work with a Git newer than 1.6. It was only
checking for files which were removed from git.git in v1.6.0-rc0~56
[1].
1. http://github.com/git/git/commit/v1.6.0-rc0~56
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
