Skip to content

Commit 035ff39

Browse files
Thomas Rastgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2096188 commit 035ff39

File tree

2 files changed

+49
-9
lines changed

2 files changed

+49
-9
lines changed

t/t4211-line-log.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ canned_test "-L 20:a.c simple" end-of-file
3737
canned_test "-L '/long f/',/^}/:a.c -L /main/,/^}/:a.c simple" two-ranges
3838
canned_test "-L 24,+1:a.c simple" vanishes-early
3939

40-
canned_test "-L '/long f/,/^}/:b.c' move-support" move-support-f
40+
canned_test "-M -L '/long f/,/^}/:b.c' move-support" move-support-f
4141

4242
canned_test "-L 4,12:a.c -L :main:a.c simple" multiple
4343
canned_test "-L 4,18:a.c -L :main:a.c simple" multiple-overlapping

t/t4211/expect.move-support-f

Lines changed: 48 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,62 @@ diff --git a/b.c b/b.c
1919
return s;
2020
}
2121

22-
commit e6da343666244ea9e67cbe3f3bd26da860f9fe0e
22+
commit a6eb82647d5d67f893da442f8f9375fd89a3b1e2
2323
Author: Thomas Rast <[email protected]>
24-
Date: Thu Feb 28 10:49:28 2013 +0100
24+
Date: Thu Feb 28 10:45:16 2013 +0100
2525

26-
move file
26+
touch both functions
2727

28-
diff --git a/b.c b/b.c
29-
--- /dev/null
30-
+++ b/b.c
31-
@@ -0,0 +4,9 @@
28+
diff --git a/a.c b/a.c
29+
--- a/a.c
30+
+++ b/a.c
31+
@@ -3,9 +3,9 @@
32+
-int f(int x)
3233
+long f(long x)
34+
{
35+
int s = 0;
36+
while (x) {
37+
x >>= 1;
38+
s++;
39+
}
40+
return s;
41+
}
42+
43+
commit f04fb20f2c77850996cba739709acc6faecc58f7
44+
Author: Thomas Rast <[email protected]>
45+
Date: Thu Feb 28 10:44:55 2013 +0100
46+
47+
change f()
48+
49+
diff --git a/a.c b/a.c
50+
--- a/a.c
51+
+++ b/a.c
52+
@@ -3,8 +3,9 @@
53+
int f(int x)
54+
{
55+
int s = 0;
56+
while (x) {
57+
x >>= 1;
58+
s++;
59+
}
60+
+ return s;
61+
}
62+
63+
commit de4c48ae814792c02a49c4c3c0c757ae69c55f6a
64+
Author: Thomas Rast <[email protected]>
65+
Date: Thu Feb 28 10:44:48 2013 +0100
66+
67+
initial
68+
69+
diff --git a/a.c b/a.c
70+
--- /dev/null
71+
+++ b/a.c
72+
@@ -0,0 +3,8 @@
73+
+int f(int x)
3374
+{
3475
+ int s = 0;
3576
+ while (x) {
3677
+ x >>= 1;
3778
+ s++;
3879
+ }
39-
+ return s;
4080
+}

0 commit comments

Comments
 (0)