[Bug 1095181] Re: terrible breakage on git rebase

2014-11-24 Thread Raman Gupta
Rolf, I had this issue too. The problem is that etckeeper updates the .etckeeper file in a pre-commit hook (this file is necessary because git does not store the owner and permissions directly). When you are rebasing, somehow the pre-commit hook interacts badly with the rebase. However, its quite

[Bug 1095181] Re: terrible breakage on git rebase

2014-04-10 Thread Rolf Leggewie
How about putting .etckeeper in a separate branch, I wonder? Having .etckeeper lumped in with other commits is often wrong and creates problems for me when I want to cherry-pick or rebase. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubunt

[Bug 1095181] Re: terrible breakage on git rebase

2014-04-10 Thread Rolf Leggewie
Sorry for the delay in responding. I've never understood what metadata etckeeper does indeed track that git wouldn't. I only know that git won't track empty directories and that can create problems. I believe the README is indeed mistaken here. I'm not sure what to add in terms of exact steps.

[Bug 1095181] Re: terrible breakage on git rebase

2013-03-03 Thread Launchpad Bug Tracker
[Expired for etckeeper (Ubuntu) because there has been no activity for 60 days.] ** Changed in: etckeeper (Ubuntu) Status: Incomplete => Expired -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/10

[Bug 1095181] Re: terrible breakage on git rebase

2013-01-02 Thread Serge Hallyn
Thanks for taking the time to report this bug. The README in etckeeper points out that etckeeper tracks file metadata that git otherwise ignores. Could you tell us exactly how what steps you are taking, i.e. how you are rebasing? Could you tell us which release you are on? ** Changed in: etckee