Re: [BUG] rebase --interactive silently overwrites ignored files

2019-05-07 Thread Phillip Wood
Hi Junio On 05/05/2019 05:02, Junio C Hamano wrote: Phillip Wood writes: I've had a look at the rebase -i code and I think it only overwrites ignored files when it is fast-forwarding. This matches what merge does when fast-forwarding but I'm not convinced either of them should be doing this b

Re: [BUG] rebase --interactive silently overwrites ignored files

2019-05-04 Thread Junio C Hamano
Phillip Wood writes: > I've had a look at the rebase -i code and I think it only overwrites > ignored files when it is fast-forwarding. This matches what merge does > when fast-forwarding but I'm not convinced either of them should be > doing this by default (I think checkout doing it is probably

Re: [BUG] rebase --interactive silently overwrites ignored files

2019-05-02 Thread Duy Nguyen
On Thu, May 2, 2019 at 10:45 PM Phillip Wood wrote: > > Hi wh > > On 14/04/2019 02:59, wh wrote: > > Thanks for the info about the upcoming "precious" attribute. Looks useful. > > > > I didn't get the impression that Git normally overwrites ignored > > files. Please do not include me in these dis

Re: [BUG] rebase --interactive silently overwrites ignored files

2019-05-02 Thread Phillip Wood
Hi wh On 14/04/2019 02:59, wh wrote: Thanks for the info about the upcoming "precious" attribute. Looks useful. I didn't get the impression that Git normally overwrites ignored files. I ran some more experiments: git rebase FETCH_HEAD# bails git rebase -i FETCH_HEAD # overwrites gi

Re: [BUG] rebase --interactive silently overwrites ignored files

2019-04-14 Thread Phillip Wood
On 14/04/2019 02:59, wh wrote: Thanks for the info about the upcoming "precious" attribute. Looks useful. Hmm, unfortunately it's not looking so hopeful now [1] I didn't get the impression that Git normally overwrites ignored files. I ran some more experiments: git rebase FETCH_HEAD#

Re: [BUG] rebase --interactive silently overwrites ignored files

2019-04-13 Thread wh
Thanks for the info about the upcoming "precious" attribute. Looks useful. I didn't get the impression that Git normally overwrites ignored files. I ran some more experiments: git rebase FETCH_HEAD# bails git rebase -i FETCH_HEAD # overwrites git merge FETCH_HEAD # bails git r

Re: [BUG] rebase --interactive silently overwrites ignored files

2019-04-12 Thread Phillip Wood
Hi On 12/04/2019 00:56, wh wrote: I'm using git 2.20.1 from Debian. Git is usually careful not to overwrite untracked files, including ignored files. Git normally overwrites ignored files, so I think in your example rebase -i is working as expected, I'm surprised that the am based rebase does

[BUG] rebase --interactive silently overwrites ignored files

2019-04-11 Thread wh
I'm using git 2.20.1 from Debian. Git is usually careful not to overwrite untracked files, including ignored files. But interactive rebase doesn't detect this (non-interactive rebase works fine). Reproduction: - #!/bin/sh mkdir upstream cd upstream git init echo 1 >feature-1 git add feature-1