#!/bin/sh
#
# Copyright (c) 2008 Stephen Haberman
#

global test_description := ''git rebase preserve merges

This test runs git rebase with preserve merges and ensures commits
dropped by the --cherry-pick flag have their childrens parents
rewritten.
''
source ./test-lib.sh

# set up two branches like this:
#
# A - B - C - D - E
#   \
#     F - G - H
#       \
#         I
#
# where B, D and G touch the same file.

test_expect_success 'setup' '
	test_commit A file1 &&
	test_commit B file1 1 &&
	test_commit C file2 &&
	test_commit D file1 2 &&
	test_commit E file3 &&
	git checkout A &&
	test_commit F file4 &&
	test_commit G file1 3 &&
	test_commit H file5 &&
	git checkout F &&
	test_commit I file6
'

# A - B - C - D - E
#   \             \ \
#     F - G - H -- L \        -->   L
#       \            |               \
#         I -- G2 -- J -- K           I -- K
# G2 = same changes as G
test_expect_success 'skip same-resolution merges with -p' '
	git checkout H &&
	test_must_fail git merge E &&
	test_commit L file1 23 &&
	git checkout I &&
	test_commit G2 file1 3 &&
	test_must_fail git merge E &&
	test_commit J file1 23 &&
	test_commit K file7 file7 &&
	git rebase -i -p L &&
	test $(git rev-parse HEAD^^) = $(git rev-parse L) &&
	test "23" = "$(cat file1)" &&
	test "I" = "$(cat file6)" &&
	test "file7" = "$(cat file7)"
'

# A - B - C - D - E
#   \             \ \
#     F - G - H -- L2 \        -->   L2
#       \             |                \
#         I -- G3 --- J2 -- K2           I -- G3 -- K2
# G2 = different changes as G
test_expect_success 'keep different-resolution merges with -p' '
	git checkout H &&
	test_must_fail git merge E &&
	test_commit L2 file1 23 &&
	git checkout I &&
	test_commit G3 file1 4 &&
	test_must_fail git merge E &&
	test_commit J2 file1 24 &&
	test_commit K2 file7 file7 &&
	test_must_fail git rebase -i -p L2 &&
	echo 234 > file1 &&
	git add file1 &&
	git rebase --continue &&
	test $(git rev-parse HEAD^^^) = $(git rev-parse L2) &&
	test "234" = "$(cat file1)" &&
	test "I" = "$(cat file6)" &&
	test "file7" = "$(cat file7)"
'

test_done
(CommandList
  children: [
    (Assignment
      keyword: Assign_None
      pairs: [
        (assign_pair
          lhs: (LhsName name:test_description)
          op: Equal
          rhs: 
            {
              (SQ <"git rebase preserve merges\n"> <"\n"> 
                <"This test runs git rebase with preserve merges and ensures commits\n"> <"dropped by the --cherry-pick flag have their childrens parents\n"> <"rewritten.\n">
              )
            }
          spids: [13]
        )
      ]
      spids: [13]
    )
    (C {(.)} {(./test-lib.sh)})
    (C {(test_expect_success)} {(SQ <setup>)} 
      {
        (SQ <"\n"> <"\ttest_commit A file1 &&\n"> <"\ttest_commit B file1 1 &&\n"> 
          <"\ttest_commit C file2 &&\n"> <"\ttest_commit D file1 2 &&\n"> <"\ttest_commit E file3 &&\n"> <"\tgit checkout A &&\n"> 
          <"\ttest_commit F file4 &&\n"> <"\ttest_commit G file1 3 &&\n"> <"\ttest_commit H file5 &&\n"> <"\tgit checkout F &&\n"> 
          <"\ttest_commit I file6\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"skip same-resolution merges with -p">)} 
      {
        (SQ <"\n"> <"\tgit checkout H &&\n"> <"\ttest_must_fail git merge E &&\n"> 
          <"\ttest_commit L file1 23 &&\n"> <"\tgit checkout I &&\n"> <"\ttest_commit G2 file1 3 &&\n"> <"\ttest_must_fail git merge E &&\n"> 
          <"\ttest_commit J file1 23 &&\n"> <"\ttest_commit K file7 file7 &&\n"> <"\tgit rebase -i -p L &&\n"> 
          <"\ttest $(git rev-parse HEAD^^) = $(git rev-parse L) &&\n"> <"\ttest \"23\" = \"$(cat file1)\" &&\n"> <"\ttest \"I\" = \"$(cat file6)\" &&\n"> 
          <"\ttest \"file7\" = \"$(cat file7)\"\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"keep different-resolution merges with -p">)} 
      {
        (SQ <"\n"> <"\tgit checkout H &&\n"> <"\ttest_must_fail git merge E &&\n"> 
          <"\ttest_commit L2 file1 23 &&\n"> <"\tgit checkout I &&\n"> <"\ttest_commit G3 file1 4 &&\n"> <"\ttest_must_fail git merge E &&\n"> 
          <"\ttest_commit J2 file1 24 &&\n"> <"\ttest_commit K2 file7 file7 &&\n"> <"\ttest_must_fail git rebase -i -p L2 &&\n"> 
          <"\techo 234 > file1 &&\n"> <"\tgit add file1 &&\n"> <"\tgit rebase --continue &&\n"> 
          <"\ttest $(git rev-parse HEAD^^^) = $(git rev-parse L2) &&\n"> <"\ttest \"234\" = \"$(cat file1)\" &&\n"> <"\ttest \"I\" = \"$(cat file6)\" &&\n"> 
          <"\ttest \"file7\" = \"$(cat file7)\"\n">
        )
      }
    )
    (C {(test_done)})
  ]
)