Skip to content

Commit

Permalink
t4211: pass -M to 'git log -M -L...' test
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Rast authored and Junio C Hamano committed Apr 12, 2013
1 parent 2096188 commit 035ff39
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 9 deletions.
2 changes: 1 addition & 1 deletion t/t4211-line-log.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
56 changes: 48 additions & 8 deletions t/t4211/expect.move-support-f
Original file line number Diff line number Diff line change
Expand Up @@ -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;
+}

0 comments on commit 035ff39

Please sign in to comment.