Re: [StGIT PATCH] Test "stg rebase" after "stg commit"
- From
Karl Hasselström <kha@treskal.com>
- Date
- May 6, 2007, 12:21 UTC
- Message-ID
- <20070506122116.GA18883@diana.vm.bytemark.co.uk>
- In-Reply-To
- <20070504081021.14786.77675.stgit@yoghurt>
On 2007-05-04 10:13:21 +0200, Karl Hasselström wrote:
Show 10 quoted lines
> 2. Try to commit a patch, and then rebase. This doesn't work, > because "stg rebase" aborts if orig-base != base, and "stg > commit" doesn't update orig-base. (It does work if "stg rebase" > is given the --force flag.) > > (2) shows a bug in "stg rebase"'s safety logic. I'm not sure how to > fix it, because I don't know how it's supposed to work in the first > place. (An obvious fix would be to update it whenever the base > changes, but that'll take some work, and I'm not convinced it can't > be done with les work. Yes, I'm lazy.) Yann, could you explain?
Another reason why this is impractical is that it's not only stgit that's allowed to change the base. For example, doing "stg pop -a && git reset --hard foobar && stg rebase qwrtflsptk" will also trigger the alarm.
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle