summaryrefslogtreecommitdiff
path: root/t/t3411-rebase-preserve-around-merges.sh
diff options
context:
space:
mode:
authorStephen Haberman <stephen@exigencecorp.com>2008-10-06 04:26:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-10-16 16:20:59 (GMT)
commitfaae853ca622844cbb2982700c43ee9b2d93a2c0 (patch)
tree0ec5ec3aff9b032e56713ab30de061b394e89923 /t/t3411-rebase-preserve-around-merges.sh
parentc82efafcfa741cdddbc68379c1905953f58ef21d (diff)
downloadgit-faae853ca622844cbb2982700c43ee9b2d93a2c0.zip
git-faae853ca622844cbb2982700c43ee9b2d93a2c0.tar.gz
git-faae853ca622844cbb2982700c43ee9b2d93a2c0.tar.bz2
rebase--interactive: fix parent rewriting for dropped commits
`rebase -i -p` got its rev-list of commits to keep by --left-right and --cherry-pick. Adding --cherry-pick would drop commits that duplicated changes already in the rebase target. The dropped commits were then forgotten about when it came to rewriting the parents of their descendents, so the descendents would get cherry-picked with their old, unwritten parents and essentially make the rebase a no-op. This commit adds a $DOTEST/dropped directory to remember dropped commits and rewrite their children's parent as the dropped commit's possibly-rewritten first-parent. Signed-off-by: Stephen Haberman <stephen@exigencecorp.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 't/t3411-rebase-preserve-around-merges.sh')
0 files changed, 0 insertions, 0 deletions