2010/11/9 Jonathan Nieder <jrnieder@xxxxxxxxx>: > Nguyen Thai Ngoc Duy wrote: > >> Another approach is to let checkout work as usual, but refuse update refs: >> >> Â- after rebase starts, HEAD can only be updated either by rebase, or >> any commands that keep HEAD a headless ref. >> Â- the branch being rebased is locked. No commands but rebase can update it. >> >> I think the second point is good for all interactive commands like >> rebase. Create a .lock file with a signature inside (e.g. command >> name). If update_ref() callers do not give correct signature, refuse >> to update. > > I like it. ÂWould it be possible to make sure the (widespread?) practice > of using > > Â Â Â Ârm -fr .git/rebase-merge > > to terminate a rebase without going back to the original branch > still works? ÂI think it should be. > I don't know. If we can place the branch lock inside .git/rebase-merge, then yes removing that directory will also remove the lock. But how does git find the locks if they are everywhere in .git? -- Duy -- 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