t/t4302-log-line-merge-history.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2010 Bo Yang
   4 #
   5
   6 test_description='Test git log -L with merge commit'
   7
   8 . ./test-lib.sh
   9 . "$TEST_DIRECTORY"/diff-lib.sh
  10
  11 cat >path0 <<\EOF
  12 void func()
  13 {
  14         printf("hello");
  15 }
  16 EOF
  17
  18 test_expect_success 'Add path0 and commit.' '
  19         git add path0 &&
  20         git commit -m "Base commit"
  21 '
  22
  23 cat >path0 <<\EOF
  24 void func()
  25 {
  26         printf("hello earth");
  27 }
  28 EOF
  29
  30 test_expect_success 'Change path0 in master.' '
  31         git add path0 &&
  32         git commit -m "Change path0 in master"
  33 '
  34
  35 test_expect_success 'Make a new branch from the base commit' '
  36         git checkout -b feature master^
  37 '
  38
  39 cat >path0 <<\EOF
  40 void func()
  41 {
  42         print("hello moon");
  43 }
  44 EOF
  45
  46 test_expect_success 'Change path0 in feature.' '
  47         git add path0 &&
  48         git commit -m "Change path0 in feature"
  49 '
  50
  51 test_expect_success 'Merge the master to feature' '
  52         ! git merge master
  53 '
  54
  55 cat >path0 <<\EOF
  56 void func()
  57 {
  58         printf("hello earth and moon");
  59 }
  60 EOF
  61
  62 test_expect_success 'Resolve the conflict' '
  63         git add path0 &&
  64         git commit -m "Merge two branches"
  65 '
  66
  67 test_expect_success 'Show the line level log of path0' '
  68         git log --pretty=format:%s%n%b -L /func/,/^}/ path0 > current
  69 '
  70
  71 cat >expected <<\EOF
  72 Merge two branches
  73
  74 nontrivial merge found
  75 path0
  76 @@ 3,1 @@
  77         printf("hello earth and moon");
  78
  79
  80 Change path0 in master
  81
  82 diff --git a/path0 b/path0
  83 index 56aeee5..11e66c5 100644
  84 --- a/path0
  85 +++ b/path0
  86 @@ -1,4 +1,4 @@
  87  void func()
  88  {
  89 -       printf("hello");
  90 +       printf("hello earth");
  91  }
  92
  93 Change path0 in feature
  94
  95 diff --git a/path0 b/path0
  96 index 56aeee5..258fced 100644
  97 --- a/path0
  98 +++ b/path0
  99 @@ -1,4 +1,4 @@
 100  void func()
 101  {
 102 -       printf("hello");
 103 +       print("hello moon");
 104  }
 105
 106 Base commit
 107
 108 diff --git a/path0 b/path0
 109 new file mode 100644
 110 index 0000000..56aeee5
 111 --- /dev/null
 112 +++ b/path0
 113 @@ -0,0 +1,4 @@
 114 +void func()
 115 +{
 116 +       printf("hello");
 117 +}
 118 EOF
 119
 120 cat > expected-graph <<\EOF
 121 *   Merge two branches
 122 |\
 123 | |
 124 | | nontrivial merge found
 125 | | path0
 126 | | @@ 3,1 @@
 127 | |     printf("hello earth and moon");
 128 | |
 129 | |
 130 | * Change path0 in master
 131 | |
 132 | | diff --git a/path0 b/path0
 133 | | index 56aeee5..11e66c5 100644
 134 | | --- a/path0
 135 | | +++ b/path0
 136 | | @@ -3,1 +3,1 @@
 137 | | -   printf("hello");
 138 | | +   printf("hello earth");
 139 | |
 140 * | Change path0 in feature
 141 |/
 142 |
 143 |   diff --git a/path0 b/path0
 144 |   index 56aeee5..258fced 100644
 145 |   --- a/path0
 146 |   +++ b/path0
 147 |   @@ -3,1 +3,1 @@
 148 |   -   printf("hello");
 149 |   +   print("hello moon");
 150 |
 151 * Base commit
 152
 153   diff --git a/path0 b/path0
 154   new file mode 100644
 155   index 0000000..56aeee5
 156   --- /dev/null
 157   +++ b/path0
 158   @@ -0,0 +3,1 @@
 159   +     printf("hello");
 160 EOF
 161
 162 test_expect_success 'Show the line log of the 2 line of path0 with graph' '
 163         git log --pretty=format:%s%n%b --graph -L 3,+1 path0 > current-graph
 164 '
 165
 166 test_expect_success 'validate the output.' '
 167         test_cmp current expected
 168 '
 169
 170 test_expect_success 'validate the graph output.' '
 171         test_cmp current-graph expected-graph
 172 '
 173
 174 test_done