2016-09-07 17:19 GMT+02:00 Johannes Schindelin <Johannes.Schindelin@xxxxxx>:
>
> So, something like this should help (if you are interested in seeing this
> patch included, please run with it, as I am running short on time):
>
> -- snipsnap --
> diff --git a/wt-status.c b/wt-status.c
> index 6225a2d..8e4d999 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -1072,14 +1072,17 @@ static void abbrev_sha1_in_line(struct strbuf *line)
> strbuf_list_free(split);
> }
>
> -static void read_rebase_todolist(const char *fname, struct string_list *lines)
> +static void read_rebase_todolist(const char *fname, struct string_list *lines, int gently)
> {
> struct strbuf line = STRBUF_INIT;
> FILE *f = fopen(git_path("%s", fname), "r");
>
> - if (!f)
> + if (!f) {
> + if (gently)
> + return;
> die_errno("Could not open file %s for reading",
> git_path("%s", fname));
> + }
> while (!strbuf_getline_lf(&line, f)) {
> if (line.len && line.buf[0] == comment_line_char)
> continue;
> @@ -1102,8 +1105,8 @@ static void show_rebase_information(struct wt_status *s,
> struct string_list have_done = STRING_LIST_INIT_DUP;
> struct string_list yet_to_do = STRING_LIST_INIT_DUP;
>
> - read_rebase_todolist("rebase-merge/done", &have_done);
> - read_rebase_todolist("rebase-merge/git-rebase-todo",
> &yet_to_do);
> + read_rebase_todolist("rebase-merge/done", &have_done, 1);
> + read_rebase_todolist("rebase-merge/git-rebase-todo", &yet_to_do, 0);
>
> if (have_done.nr == 0)
> status_printf_ln(s, color, _("No commands done."));
>
>
That works for me. Thanks.