Re: git status during interactive rebase

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Thu, Jan 21, 2016 at 12:23 AM, Matthieu Moy
<Matthieu.Moy@xxxxxxxxxxxxxxx> wrote:
> Stefan Beller <sbeller@xxxxxxxxxx> writes:
>
>> So I ran an interactive rebase, and while editing
>> .git/rebase-merge/git-rebase-todo I tried to run
>> `git status` in another terminal to inquire about a
>> filename of an untracked file.
>>
>> However, I got:
>>
>> $ git status
>> On branch submodule-groups-v3
>> fatal: Could not open file .git/rebase-merge/done for reading: No such
>> file or directory
>>
>> Was this behavior always the case? (IIRC it worked a long time ago?)
>
> From the list of recipients, I guess you already found that the issue
> probably comes from 84e6fb9 (status: give more information during rebase
> -i, 2015-07-06), which introduced
> read_rebase_todolist("rebase-merge/done", &have_done); in wt-status.c.

I just remembered you working on git-status specially during rebase,
so I figured you may have a clue here.

> No time to work on a patch for now :-(.

:-(

> The cop-out would be to write an empty 'done' file before editing the
> todo, but it would give the wrong impression that it is safe to run `git
> rebase --continue` now... Interactive rebase is *definitely* not
> thread-safe ;-)

ok. As I did not start the rebase yet, I figured I may still ask a thing. :P

> So the proper fix might be to test for the presence of the "done" file and
> otherwise tell the user that this rebase has not even started yet.

So what Matthieu said?

Thanks,
Stefan
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]