t/t2016-checkout-patch.sh

   1 #!/bin/sh
   2
   3 test_description='git checkout --patch'
   4
   5 . ./lib-patch-mode.sh
   6
   7 test_expect_success 'setup' '
   8         mkdir dir &&
   9         echo parent > dir/foo &&
  10         echo dummy > bar &&
  11         git add bar dir/foo &&
  12         git commit -m initial &&
  13         test_tick &&
  14         test_commit second dir/foo head &&
  15         set_and_save_state bar bar_work bar_index &&
  16         save_head
  17 '
  18
  19 # note: bar sorts before dir/foo, so the first 'n' is always to skip 'bar'
  20
  21 test_expect_success 'saying "n" does nothing' '
  22         set_and_save_state dir/foo work head &&
  23         test_write_lines n n | git checkout -p &&
  24         verify_saved_state bar &&
  25         verify_saved_state dir/foo
  26 '
  27
  28 test_expect_success 'git checkout -p' '
  29         test_write_lines n y | git checkout -p &&
  30         verify_saved_state bar &&
  31         verify_state dir/foo head head
  32 '
  33
  34 test_expect_success 'git checkout -p with staged changes' '
  35         set_state dir/foo work index &&
  36         test_write_lines n y | git checkout -p &&
  37         verify_saved_state bar &&
  38         verify_state dir/foo index index
  39 '
  40
  41 test_expect_success 'git checkout -p HEAD with NO staged changes: abort' '
  42         set_and_save_state dir/foo work head &&
  43         test_write_lines n y n | git checkout -p HEAD &&
  44         verify_saved_state bar &&
  45         verify_saved_state dir/foo
  46 '
  47
  48 test_expect_success 'git checkout -p HEAD with NO staged changes: apply' '
  49         test_write_lines n y y | git checkout -p HEAD &&
  50         verify_saved_state bar &&
  51         verify_state dir/foo head head
  52 '
  53
  54 test_expect_success 'git checkout -p HEAD with change already staged' '
  55         set_state dir/foo index index &&
  56         # the third n is to get out in case it mistakenly does not apply
  57         test_write_lines n y n | git checkout -p HEAD &&
  58         verify_saved_state bar &&
  59         verify_state dir/foo head head
  60 '
  61
  62 test_expect_success 'git checkout -p HEAD^...' '
  63         # the third n is to get out in case it mistakenly does not apply
  64         test_write_lines n y n | git checkout -p HEAD^... &&
  65         verify_saved_state bar &&
  66         verify_state dir/foo parent parent
  67 '
  68
  69 test_expect_success 'git checkout -p HEAD^' '
  70         # the third n is to get out in case it mistakenly does not apply
  71         test_write_lines n y n | git checkout -p HEAD^ &&
  72         verify_saved_state bar &&
  73         verify_state dir/foo parent parent
  74 '
  75
  76 test_expect_success 'git checkout -p handles deletion' '
  77         set_state dir/foo work index &&
  78         rm dir/foo &&
  79         test_write_lines n y | git checkout -p &&
  80         verify_saved_state bar &&
  81         verify_state dir/foo index index
  82 '
  83
  84 # The idea in the rest is that bar sorts first, so we always say 'y'
  85 # first and if the path limiter fails it'll apply to bar instead of
  86 # dir/foo.  There's always an extra 'n' to reject edits to dir/foo in
  87 # the failure case (and thus get out of the loop).
  88
  89 test_expect_success 'path limiting works: dir' '
  90         set_state dir/foo work head &&
  91         test_write_lines y n | git checkout -p dir &&
  92         verify_saved_state bar &&
  93         verify_state dir/foo head head
  94 '
  95
  96 test_expect_success 'path limiting works: -- dir' '
  97         set_state dir/foo work head &&
  98         test_write_lines y n | git checkout -p -- dir &&
  99         verify_saved_state bar &&
 100         verify_state dir/foo head head
 101 '
 102
 103 test_expect_success 'path limiting works: HEAD^ -- dir' '
 104         # the third n is to get out in case it mistakenly does not apply
 105         test_write_lines y n n | git checkout -p HEAD^ -- dir &&
 106         verify_saved_state bar &&
 107         verify_state dir/foo parent parent
 108 '
 109
 110 test_expect_success 'path limiting works: foo inside dir' '
 111         set_state dir/foo work head &&
 112         # the third n is to get out in case it mistakenly does not apply
 113         test_write_lines y n n | (cd dir && git checkout -p foo) &&
 114         verify_saved_state bar &&
 115         verify_state dir/foo head head
 116 '
 117
 118 test_expect_success 'none of this moved HEAD' '
 119         verify_saved_head
 120 '
 121
 122 test_expect_success 'empty tree can be handled' '
 123         test_when_finished "git reset --hard" &&
 124         git checkout -p $(test_oid empty_tree) --
 125 '
 126
 127 test_done