#!/bin/sh

global test_description := ''test cherry-picking an empty commit''

source ./test-lib.sh

test_expect_success setup '

	echo first > file1 &&
	git add file1 &&
	test_tick &&
	git commit -m "first" &&

	git checkout -b empty-branch &&
	test_tick &&
	git commit --allow-empty -m "empty" &&

	echo third >> file1 &&
	git add file1 &&
	test_tick &&
	git commit --allow-empty-message -m "" &&

	git checkout master &&
	git checkout -b empty-branch2 &&
	test_tick &&
	git commit --allow-empty -m "empty"

'

test_expect_success 'cherry-pick an empty commit' '
	git checkout master &&
	test_expect_code 1 git cherry-pick empty-branch^
'

test_expect_success 'index lockfile was removed' '
	test ! -f .git/index.lock
'

test_expect_success 'cherry-pick a commit with an empty message' '
	git checkout master &&
	test_expect_code 1 git cherry-pick empty-branch
'

test_expect_success 'index lockfile was removed' '
	test ! -f .git/index.lock
'

test_expect_success 'cherry-pick a commit with an empty message with --allow-empty-message' '
	git checkout -f master &&
	git cherry-pick --allow-empty-message empty-branch
'

test_expect_success 'cherry pick an empty non-ff commit without --allow-empty' '
	git checkout master &&
	echo fourth >>file2 &&
	git add file2 &&
	git commit -m "fourth" &&
	test_must_fail git cherry-pick empty-branch2
'

test_expect_success 'cherry pick an empty non-ff commit with --allow-empty' '
	git checkout master &&
	git cherry-pick --allow-empty empty-branch2
'

test_expect_success 'cherry pick with --keep-redundant-commits' '
	git checkout master &&
	git cherry-pick --keep-redundant-commits HEAD^
'

test_expect_success 'cherry-pick a commit that becomes no-op (prep)' '
	git checkout master &&
	git branch fork &&
	echo foo >file2 &&
	git add file2 &&
	test_tick &&
	git commit -m "add file2 on master" &&

	git checkout fork &&
	echo foo >file2 &&
	git add file2 &&
	test_tick &&
	git commit -m "add file2 on the side"
'

test_expect_success 'cherry-pick a no-op without --keep-redundant' '
	git reset --hard &&
	git checkout fork^0 &&
	test_must_fail git cherry-pick master
'

test_expect_success 'cherry-pick a no-op with --keep-redundant' '
	git reset --hard &&
	git checkout fork^0 &&
	git cherry-pick --keep-redundant-commits master &&
	git show -s --format=%s >actual &&
	echo "add file2 on master" >expect &&
	test_cmp expect actual
'

test_done
(CommandList
  children: [
    (Assignment
      keyword: Assign_None
      pairs: [
        (assign_pair
          lhs: (LhsName name:test_description)
          op: Equal
          rhs: {(SQ <"test cherry-picking an empty commit">)}
          spids: [4]
        )
      ]
      spids: [4]
    )
    (C {(.)} {(./test-lib.sh)})
    (C {(test_expect_success)} {(setup)} 
      {
        (SQ <"\n"> <"\n"> <"\techo first > file1 &&\n"> <"\tgit add file1 &&\n"> <"\ttest_tick &&\n"> 
          <"\tgit commit -m \"first\" &&\n"> <"\n"> <"\tgit checkout -b empty-branch &&\n"> <"\ttest_tick &&\n"> 
          <"\tgit commit --allow-empty -m \"empty\" &&\n"> <"\n"> <"\techo third >> file1 &&\n"> <"\tgit add file1 &&\n"> <"\ttest_tick &&\n"> 
          <"\tgit commit --allow-empty-message -m \"\" &&\n"> <"\n"> <"\tgit checkout master &&\n"> <"\tgit checkout -b empty-branch2 &&\n"> <"\ttest_tick &&\n"> 
          <"\tgit commit --allow-empty -m \"empty\"\n"> <"\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"cherry-pick an empty commit">)} 
      {
        (SQ <"\n"> <"\tgit checkout master &&\n"> 
          <"\ttest_expect_code 1 git cherry-pick empty-branch^\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"index lockfile was removed">)} 
      {(SQ <"\n"> <"\ttest ! -f .git/index.lock\n">)}
    )
    (C {(test_expect_success)} {(SQ <"cherry-pick a commit with an empty message">)} 
      {
        (SQ <"\n"> <"\tgit checkout master &&\n"> 
          <"\ttest_expect_code 1 git cherry-pick empty-branch\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"index lockfile was removed">)} 
      {(SQ <"\n"> <"\ttest ! -f .git/index.lock\n">)}
    )
    (C {(test_expect_success)} 
      {(SQ <"cherry-pick a commit with an empty message with --allow-empty-message">)} 
      {
        (SQ <"\n"> <"\tgit checkout -f master &&\n"> 
          <"\tgit cherry-pick --allow-empty-message empty-branch\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"cherry pick an empty non-ff commit without --allow-empty">)} 
      {
        (SQ <"\n"> <"\tgit checkout master &&\n"> <"\techo fourth >>file2 &&\n"> 
          <"\tgit add file2 &&\n"> <"\tgit commit -m \"fourth\" &&\n"> <"\ttest_must_fail git cherry-pick empty-branch2\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"cherry pick an empty non-ff commit with --allow-empty">)} 
      {
        (SQ <"\n"> <"\tgit checkout master &&\n"> <"\tgit cherry-pick --allow-empty empty-branch2\n">)
      }
    )
    (C {(test_expect_success)} {(SQ <"cherry pick with --keep-redundant-commits">)} 
      {
        (SQ <"\n"> <"\tgit checkout master &&\n"> 
          <"\tgit cherry-pick --keep-redundant-commits HEAD^\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"cherry-pick a commit that becomes no-op (prep)">)} 
      {
        (SQ <"\n"> <"\tgit checkout master &&\n"> <"\tgit branch fork &&\n"> <"\techo foo >file2 &&\n"> 
          <"\tgit add file2 &&\n"> <"\ttest_tick &&\n"> <"\tgit commit -m \"add file2 on master\" &&\n"> <"\n"> 
          <"\tgit checkout fork &&\n"> <"\techo foo >file2 &&\n"> <"\tgit add file2 &&\n"> <"\ttest_tick &&\n"> 
          <"\tgit commit -m \"add file2 on the side\"\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"cherry-pick a no-op without --keep-redundant">)} 
      {
        (SQ <"\n"> <"\tgit reset --hard &&\n"> <"\tgit checkout fork^0 &&\n"> 
          <"\ttest_must_fail git cherry-pick master\n">
        )
      }
    )
    (C {(test_expect_success)} {(SQ <"cherry-pick a no-op with --keep-redundant">)} 
      {
        (SQ <"\n"> <"\tgit reset --hard &&\n"> <"\tgit checkout fork^0 &&\n"> 
          <"\tgit cherry-pick --keep-redundant-commits master &&\n"> <"\tgit show -s --format=%s >actual &&\n"> <"\techo \"add file2 on master\" >expect &&\n"> 
          <"\ttest_cmp expect actual\n">
        )
      }
    )
    (C {(test_done)})
  ]
)