mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
209618860c
commit
035ff3987b
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
+}
|
||||
|
|
Loading…
Reference in a new issue