| commit | 64e15469e9ddf6e038b967beeae75c79d1a29460 | |
| author | Catalin Marinas <catalin.marinas@gmail.com> | |
| Fri, 28 Sep 2007 21:51:15 +0000 (28 22:51 +0100) | ||
| committer | Catalin Marinas <catalin.marinas@gmail.com> | |
| Fri, 28 Sep 2007 21:51:15 +0000 (28 22:51 +0100) | ||
| tree | ed54b1260f2815946ebcad9f9237005d284aa2b8 | treesnapshot (tar.gz zip) |
| parent | 1d5cfe617d97d943b41f4be17c4f5955a7026297 | commitdiff |
Fix the rebasing with an external command
Since git.py caches the HEAD value, rebasing with and external command
didn't clear the cache and the subsequent push simple fast-forwards
the tree. The patch creates a new git.rebase() function which takes
care of custom rebase commands. It also removes "must_rebase" in
pull.py as it doesn't seem to be used.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Since git.py caches the HEAD value, rebasing with and external command
didn't clear the cache and the subsequent push simple fast-forwards
the tree. The patch creates a new git.rebase() function which takes
care of custom rebase commands. It also removes "must_rebase" in
pull.py as it doesn't seem to be used.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
| stgit/commands/common.py | diffblobblamehistory | |
| stgit/commands/pull.py | diffblobblamehistory | |
| stgit/git.py | diffblobblamehistory |