chiark / gitweb /
Remove the --force flag to "stg rebase" and "stg pull"
authorKarl Hasselström <kha@treskal.com>
Tue, 11 Sep 2007 00:09:23 +0000 (02:09 +0200)
committerKarl Hasselström <kha@treskal.com>
Sun, 7 Oct 2007 22:14:11 +0000 (00:14 +0200)
commit751c890baeb20118bcdea0b735c85995b7f588fa
tree848494654373d8fd9d0b15272ba8bf9f14c4c534
parentd9d460a1eef90a883584d07b840f89ccdd332d45
Remove the --force flag to "stg rebase" and "stg pull"

Instead, always behave as if the force flag was given; that is, don't
check if rebasing would leave a dangling commit behind. Reasons:

  * The check for this was very strict and caused a lot of false
    positives.

  * Everything is recorded in the reflog, so we can't actually lose
    commits.

This fixes bug 9181.

Signed-off-by: Karl Hasselström <kha@treskal.com>
stgit/commands/common.py
stgit/commands/pull.py
stgit/commands/rebase.py
stgit/stack.py
t/t2100-pull-policy-fetch.sh
t/t2102-pull-policy-rebase.sh