| commit | f0b2610350d33d26cf25d97ed155d28bdb38f5f6 | |
| author | Karl Wiberg <kha@treskal.com> | |
| Tue, 24 Sep 2013 23:26:08 +0000 (25 01:26 +0200) | ||
| committer | Karl Wiberg <kha@treskal.com> | |
| Wed, 25 Sep 2013 00:06:48 +0000 (25 02:06 +0200) | ||
| tree | b7198e9a84ea416898a3cff9b857401911445d57 | treesnapshot (tar.gz zip) |
| parent | 15160bc8382607bc9db04695fedf85119e571986 | commitdiff |
Fix rebase where a directory is replaced by a file (fixes t2201 failure)
One of the tests introduced in the previous commit failed because the
logic to remove files during rebase was broken; this patch fixes it by
removing it entirely, since it doesn't appear to have been necessary
in the first place.
Signed-off-by: Karl Wiberg <kha@treskal.com>
One of the tests introduced in the previous commit failed because the
logic to remove files during rebase was broken; this patch fixes it by
removing it entirely, since it doesn't appear to have been necessary
in the first place.
Signed-off-by: Karl Wiberg <kha@treskal.com>
| stgit/git.py | diffblobblamehistory | |
| t/t2201-rebase-file-dir.sh | diffblobblamehistory |