chiark / gitweb /
~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bd69fea) | patch
Test "stg rebase" after "stg commit"
authorYann Dirson <ydirson@altern.org>
Tue, 12 Jun 2007 21:57:06 +0000 (22:57 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Tue, 12 Jun 2007 21:57:06 +0000 (22:57 +0100)
commita02ba4077f12578fe31c99d903488804a656e1c4
tree817176b843f3c65d5deb435aa6e76356a400f5ebtree | snapshot
parentbd69feaf7c3c94b6e7e216ea8091064af9cdfa97commit | diff
Test "stg rebase" after "stg commit"

Two new tests for "stg rebase":

  1. Try to rebase to a commit that is ahead of HEAD. This should
     work, and does.

  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.)

Signed-off-by: Karl Hasselström <kha@treskal.com>
Signed-off-by: Karl Hasselström <kha@treskal.com>
t/t2200-rebase.sh diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)