diff options
| author |  Thomas Rast <trast@inf.ethz.ch> | 2013-04-12 18:05:09 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-04-12 11:34:12 -0700 |
| commit | 035ff3987bcbe93a823f47befbe019319c1484b0 (patch) | |
| tree | f684b0da6181ac1e5ed857efaa61ba62936b372a | |
| parent | log -L: fix overlapping input ranges (diff) | |
| download | tgif-035ff3987bcbe93a823f47befbe019319c1484b0.tar.xz | |
t4211: pass -M to 'git log -M -L...' test
Embarrassingly, the -M test did not actually invoke -M, and thus not
really test the feature.
Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t4211-line-log.sh | 2 | ||||
| -rw-r--r-- | t/t4211/expect.move-support-f | 56 |
2 files changed, 49 insertions, 9 deletions
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh index 2341351e1b..2a67e31bd7 100755 --- a/t/t4211-line-log.sh +++ b/t/t4211-line-log.sh @@ -37,7 +37,7 @@ canned_test "-L 20:a.c simple" end-of-file canned_test "-L '/long f/',/^}/:a.c -L /main/,/^}/:a.c simple" two-ranges canned_test "-L 24,+1:a.c simple" vanishes-early -canned_test "-L '/long f/,/^}/:b.c' move-support" move-support-f +canned_test "-M -L '/long f/,/^}/:b.c' move-support" move-support-f canned_test "-L 4,12:a.c -L :main:a.c simple" multiple canned_test "-L 4,18:a.c -L :main:a.c simple" multiple-overlapping diff --git a/t/t4211/expect.move-support-f b/t/t4211/expect.move-support-f index 78a8cf1afd..c905e01bc2 100644 --- a/t/t4211/expect.move-support-f +++ b/t/t4211/expect.move-support-f @@ -19,22 +19,62 @@ diff --git a/b.c b/b.c return s; } -commit e6da343666244ea9e67cbe3f3bd26da860f9fe0e +commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2 Author: Thomas Rast <trast@student.ethz.ch> -Date: Thu Feb 28 10:49:28 2013 +0100 +Date: Thu Feb 28 10:45:16 2013 +0100 - move file + touch both functions -diff --git a/b.c b/b.c ---- /dev/null -+++ b/b.c -@@ -0,0 +4,9 @@ +diff --git a/a.c b/a.c +--- a/a.c ++++ b/a.c +@@ -3,9 +3,9 @@ +-int f(int x) +long f(long x) + { + int s = 0; + while (x) { + x >>= 1; + s++; + } + return s; + } + +commit f04fb20f2c77850996cba739709acc6faecc58f7 +Author: Thomas Rast <trast@student.ethz.ch> +Date: Thu Feb 28 10:44:55 2013 +0100 + + change f() + +diff --git a/a.c b/a.c +--- a/a.c ++++ b/a.c +@@ -3,8 +3,9 @@ + int f(int x) + { + int s = 0; + while (x) { + x >>= 1; + s++; + } ++ return s; + } + +commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a +Author: Thomas Rast <trast@student.ethz.ch> +Date: Thu Feb 28 10:44:48 2013 +0100 + + initial + +diff --git a/a.c b/a.c +--- /dev/null ++++ b/a.c +@@ -0,0 +3,8 @@ ++int f(int x) +{ + int s = 0; + while (x) { + x >>= 1; + s++; + } -+ return s; +} |