t/t4301-log-line-single-history.sh:
test the linear line of history with '--graph' option;
t/t4302-log-line-merge-history.sh:
test the case that there are merges in the history with
'--graph' option.
Note that, '--full-line-diff' option will take no effect when
'--graph' is also given.
Signed-off-by: Bo Yang <struggleyb.nku@xxxxxxxxx>
---
Documentation/git-log.txt | 2 +
t/t4301-log-line-single-history.sh | 225 ++++++++++++++++++++++++++++++++++++
t/t4302-log-line-merge-history.sh | 51 ++++++++-
3 files changed, 277 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 6f712e7..1beb243 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -77,6 +77,8 @@ You can also specify this option more than once before each path.
--full-line-diff::
Always print the interesting range even if the current commit
does not change any line of the range.
+ Note that this option will take no effect when '--graph' is
+ also given.
[\--] <path>...::
Show only commits that affect any of the specified paths. To
diff --git a/t/t4301-log-line-single-history.sh b/t/t4301-log-line-single-history.sh
index 9cf34f8..812a41e 100755
--- a/t/t4301-log-line-single-history.sh
+++ b/t/t4301-log-line-single-history.sh
@@ -339,4 +339,229 @@ test_expect_success \
test_cmp current-linenum expected-linenum &&
test_cmp current-always expected-always'
+# Rerun all log with graph
+test_expect_success \
+ 'Show the line level log of path0 with --graph' \
+ 'git log --pretty=format:%s%n%b --graph -L /func/,/^}/ path0 > current-path0-graph'
+
+test_expect_success \
+ 'Show the line level log of path1 with --graph' \
+ 'git log --pretty=format:%s%n%b --graph -L /output/,/^}/ path1 > current-path1-graph'
+
+test_expect_success \
+ 'Show the line level log of two files with --graph' \
+ 'git log --pretty=format:%s%n%b --graph -L /func/,/^}/ path0 --graph -L /output/,/^}/ path1 > current-pathall-graph'
+
+test_expect_success \
+ 'Test the line number argument with --graph' \
+ 'git log --pretty=format:%s%n%b --graph -L 1,2 path0 > current-linenum-graph'
+
+test_expect_success \
+ 'Test the --full-line-diff option with --graph option' \
+ 'git log --pretty=format:%s%n%b --full-line-diff --graph -L 1,2 path0 > current-always-graph'
+
+cat > expected-path0-graph <<\EOF
+* Final change of path0
+|
+| diff --git a/path0 b/path0
+| index 44db133..1518c15 100644
+| --- a/path0
+| +++ b/path0
+| @@ -1,6 +1,5 @@
+| void func(){
+| int a = 10;
+| int b = 11;
+| - int c;
+| - c = 10 * (a + b);
+| + printf("%d", a - b);
+| }
+|
+* Change the 5th line of path0
+|
+| diff --git a/path0 b/path0
+| index 9ef1692..44db133 100644
+| --- a/path0
+| +++ b/path0
+| @@ -1,6 +1,6 @@
+| void func(){
+| int a = 10;
+| int b = 11;
+| int c;
+| - c = a + b;
+| + c = 10 * (a + b);
+| }
+|
+* Change 2,3 lines of path0 and path1
+|
+| diff --git a/path0 b/path0
+| index aabffdf..9ef1692 100644
+| --- a/path0
+| +++ b/path0
+| @@ -1,6 +1,6 @@
+| void func(){
+| - int a = 0;
+| - int b = 1;
+| + int a = 10;
+| + int b = 11;
+| int c;
+| c = a + b;
+| }
+|
+* Base commit
+
+ diff --git a/path0 b/path0
+ new file mode 100644
+ index 0000000..aabffdf
+ --- /dev/null
+ +++ b/path0
+ @@ -0,0 +1,6 @@
+ +void func(){
+ + int a = 0;
+ + int b = 1;
+ + int c;
+ + c = a + b;
+ +}
+EOF
+
+cat > expected-path1-graph <<\EOF
+* Change 2,3 lines of path0 and path1
+|
+| diff --git a/path1 b/path1
+| index 997d841..1d711b5 100644
+| --- a/path1
+| +++ b/path1
+| @@ -1,3 +1,4 @@
+| void output(){
+| - printf("hello world");
+| + const char *str = "hello world!";
+| + printf("%s", str);
+| }
+|
+* Base commit
+
+ diff --git a/path1 b/path1
+ new file mode 100644
+ index 0000000..997d841
+ --- /dev/null
+ +++ b/path1
+ @@ -0,0 +1,3 @@
+ +void output(){
+ + printf("hello world");
+ +}
+EOF
+
+cat > expected-pathall-graph <<\EOF
+* Final change of path0
+|
+| diff --git a/path0 b/path0
+| index 44db133..1518c15 100644
+| --- a/path0
+| +++ b/path0
+| @@ -1,6 +1,5 @@
+| void func(){
+| int a = 10;
+| int b = 11;
+| - int c;
+| - c = 10 * (a + b);
+| + printf("%d", a - b);
+| }
+|
+* Change the 5th line of path0
+|
+| diff --git a/path0 b/path0
+| index 9ef1692..44db133 100644
+| --- a/path0
+| +++ b/path0
+| @@ -1,6 +1,6 @@
+| void func(){
+| int a = 10;
+| int b = 11;
+| int c;
+| - c = a + b;
+| + c = 10 * (a + b);
+| }
+|
+* Change 2,3 lines of path0 and path1
+|
+| diff --git a/path0 b/path0
+| index aabffdf..9ef1692 100644
+| --- a/path0
+| +++ b/path0
+| @@ -1,6 +1,6 @@
+| void func(){
+| - int a = 0;
+| - int b = 1;
+| + int a = 10;
+| + int b = 11;
+| int c;
+| c = a + b;
+| }
+| diff --git a/path1 b/path1
+| index 997d841..1d711b5 100644
+| --- a/path1
+| +++ b/path1
+| @@ -1,3 +1,4 @@
+| void output(){
+| - printf("hello world");
+| + const char *str = "hello world!";
+| + printf("%s", str);
+| }
+|
+* Base commit
+
+ diff --git a/path0 b/path0
+ new file mode 100644
+ index 0000000..aabffdf
+ --- /dev/null
+ +++ b/path0
+ @@ -0,0 +1,6 @@
+ +void func(){
+ + int a = 0;
+ + int b = 1;
+ + int c;
+ + c = a + b;
+ +}
+ diff --git a/path1 b/path1
+ new file mode 100644
+ index 0000000..997d841
+ --- /dev/null
+ +++ b/path1
+ @@ -0,0 +1,3 @@
+ +void output(){
+ + printf("hello world");
+ +}
+EOF
+
+cat > expected-linenum-graph <<\EOF
+* Change 2,3 lines of path0 and path1
+|
+| diff --git a/path0 b/path0
+| index aabffdf..9ef1692 100644
+| --- a/path0
+| +++ b/path0
+| @@ -1,2 +1,2 @@
+| void func(){
+| - int a = 0;
+| + int a = 10;
+|
+* Base commit
+
+ diff --git a/path0 b/path0
+ new file mode 100644
+ index 0000000..aabffdf
+ --- /dev/null
+ +++ b/path0
+ @@ -0,0 +1,2 @@
+ +void func(){
+ + int a = 0;
+EOF
+
+test_expect_success \
+ 'validate the output.' \
+ 'test_cmp current-path0-graph expected-path0-graph &&
+ test_cmp current-path1-graph expected-path1-graph &&
+ test_cmp current-pathall-graph expected-pathall-graph &&
+ test_cmp current-linenum-graph expected-linenum-graph &&
+ test_cmp current-always-graph expected-linenum-graph'
+
test_done
diff --git a/t/t4302-log-line-merge-history.sh b/t/t4302-log-line-merge-history.sh
index 02e7439..cd417d3 100755
--- a/t/t4302-log-line-merge-history.sh
+++ b/t/t4302-log-line-merge-history.sh
@@ -107,8 +107,57 @@ index 0000000..f628dea
+ printf("hello");
+}
EOF
+
+cat > expected-graph <<\EOF
+* Merge two branches
+|\
+| |
+| | nontrivial merge found
+| | path0
+| |
+| | @@ 2,1 @@
+| | printf("hello earth and moon");
+| |
+| |
+| * Change path0 in master
+| |
+| | diff --git a/path0 b/path0
+| | index f628dea..bef7fa3 100644
+| | --- a/path0
+| | +++ b/path0
+| | @@ -2,1 +2,1 @@
+| | - printf("hello");
+| | + printf("hello earth");
+| |
+* | Change path0 in feature
+|/
+|
+| diff --git a/path0 b/path0
+| index f628dea..a940ef6 100644
+| --- a/path0
+| +++ b/path0
+| @@ -2,1 +2,1 @@
+| - printf("hello");
+| + print("hello moon");
+|
+* Base commit
+
+ diff --git a/path0 b/path0
+ new file mode 100644
+ index 0000000..f628dea
+ --- /dev/null
+ +++ b/path0
+ @@ -0,0 +2,1 @@
+ + printf("hello");
+EOF
+
+test_expect_success \
+ 'Show the line log of the 2 line of path0 with graph' \
+ 'git log --pretty=format:%s%n%b --graph -L 2,+1 path0 > current-graph'
+
test_expect_success \
'validate the output.' \
- 'test_cmp current expected'
+ 'test_cmp current expected &&
+ test_cmp current-graph expected-graph'
test_done
--
1.7.0.2.273.gc2413.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html