# Bug? ran into a "fatal" using interactive rebase 4 messages from 2016-09-06 to 2016-09-08. Participants: Ralf Thielow, Johannes Schindelin. Thread: https://gitlist.dev/t/44025 ## Ralf Thielow, 2016-09-06 18:08 Subject: Bug? ran into a "fatal" using interactive rebase Message-ID: URL: https://gitlist.dev/e/CAN0XMO%2BZOV3M02wJ_%3DoMPbN4ch-%3D7gA_pXEegfHApvSNeOu3KA%40mail.gmail.com ``` Hi, today I accidentally triggered a "fatal" using interactive rebase. If you edit the instruction sheet after 'rebase -i' and add an unknown command, Git stops because it doesn't know the command. That's fine, however, now we are in a state where 'git status' fails with interactive rebase in progress; onto 311f279 fatal: Could not open file .git/rebase-merge/done for reading: No such file or directory After finishing the interactive rebase, things are fixed. Looks like a special case that isn't handled well, yet. My Git version is the current 'next' branch. Ralf ``` ## Johannes Schindelin, 2016-09-07 15:19 Subject: Re: Bug? ran into a "fatal" using interactive rebase Message-ID: URL: https://gitlist.dev/e/alpine.DEB.2.20.1609071714540.129229%40virtualbox In-Reply-To: ``` Hi Ralf, On Tue, 6 Sep 2016, Ralf Thielow wrote: > today I accidentally triggered a "fatal" using interactive rebase. > > If you edit the instruction sheet after 'rebase -i' and add an unknown > command, Git stops because it doesn't know the command. > That's fine, however, now we are in a state where 'git status' fails with > > interactive rebase in progress; onto 311f279 > fatal: Could not open file .git/rebase-merge/done for reading: No such > file or directory There was some discussion revolving around this (IIRC Matthieu was involved, hence I Cc:ed him) and I was under the impression that we fixed the status code not to assume the presence of the "done" file. Apparently I was wrong... 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.")); ``` ## Ralf Thielow, 2016-09-07 17:02 Subject: Re: Bug? ran into a "fatal" using interactive rebase Message-ID: URL: https://gitlist.dev/e/CAN0XMOL7LEcJAHhmSwq8QWH7mD7%2BjQXRkAdQA%2B3hZ2JQUJ99Gw%40mail.gmail.com In-Reply-To: ``` 2016-09-07 17:19 GMT+02:00 Johannes Schindelin : > > 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. ``` ## Johannes Schindelin, 2016-09-08 06:57 Subject: Re: Bug? ran into a "fatal" using interactive rebase Message-ID: URL: https://gitlist.dev/e/alpine.DEB.2.20.1609080856290.129229%40virtualbox In-Reply-To: ``` Hi Ralf, On Wed, 7 Sep 2016, Ralf Thielow wrote: > 2016-09-07 17:19 GMT+02:00 Johannes Schindelin : > > > > 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): What I meant is: could you craft a test, a proper commit message, and submit it? I will be mostly offline during the second half of September and have many other things to take care of right now. Thanks, Dscho ```