Browse Source
Logically, -m, -c, --cc specify 3 different formats for representing merge commits, yet -m doesn't in fact override -c or --cc, that makes no sense. Add 2 expected to fail tests that demonstrate the problem. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
Sergey Organov
4 years ago
committed by
Junio C Hamano
3 changed files with 402 additions and 0 deletions
@ -0,0 +1,200 @@
@@ -0,0 +1,200 @@
|
||||
$ git log --cc -m -p master |
||||
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0) |
||||
Merge: 9a6d494 c7a2ab9 |
||||
Author: A U Thor <author@example.com> |
||||
Date: Mon Jun 26 00:04:00 2006 +0000 |
||||
|
||||
Merge branch 'side' |
||||
|
||||
diff --git a/dir/sub b/dir/sub |
||||
index cead32e..992913c 100644 |
||||
--- a/dir/sub |
||||
+++ b/dir/sub |
||||
@@ -4,3 +4,5 @@ C |
||||
D |
||||
E |
||||
F |
||||
+1 |
||||
+2 |
||||
diff --git a/file0 b/file0 |
||||
index b414108..10a8a9f 100644 |
||||
--- a/file0 |
||||
+++ b/file0 |
||||
@@ -4,3 +4,6 @@ |
||||
4 |
||||
5 |
||||
6 |
||||
+A |
||||
+B |
||||
+C |
||||
|
||||
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a) |
||||
Merge: 9a6d494 c7a2ab9 |
||||
Author: A U Thor <author@example.com> |
||||
Date: Mon Jun 26 00:04:00 2006 +0000 |
||||
|
||||
Merge branch 'side' |
||||
|
||||
diff --git a/dir/sub b/dir/sub |
||||
index 7289e35..992913c 100644 |
||||
--- a/dir/sub |
||||
+++ b/dir/sub |
||||
@@ -1,4 +1,8 @@ |
||||
A |
||||
B |
||||
+C |
||||
+D |
||||
+E |
||||
+F |
||||
1 |
||||
2 |
||||
diff --git a/file0 b/file0 |
||||
index f4615da..10a8a9f 100644 |
||||
--- a/file0 |
||||
+++ b/file0 |
||||
@@ -1,6 +1,9 @@ |
||||
1 |
||||
2 |
||||
3 |
||||
+4 |
||||
+5 |
||||
+6 |
||||
A |
||||
B |
||||
C |
||||
diff --git a/file1 b/file1 |
||||
new file mode 100644 |
||||
index 0000000..b1e6722 |
||||
--- /dev/null |
||||
+++ b/file1 |
||||
@@ -0,0 +1,3 @@ |
||||
+A |
||||
+B |
||||
+C |
||||
diff --git a/file2 b/file2 |
||||
deleted file mode 100644 |
||||
index 01e79c3..0000000 |
||||
--- a/file2 |
||||
+++ /dev/null |
||||
@@ -1,3 +0,0 @@ |
||||
-1 |
||||
-2 |
||||
-3 |
||||
diff --git a/file3 b/file3 |
||||
deleted file mode 100644 |
||||
index 7289e35..0000000 |
||||
--- a/file3 |
||||
+++ /dev/null |
||||
@@ -1,4 +0,0 @@ |
||||
-A |
||||
-B |
||||
-1 |
||||
-2 |
||||
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a |
||||
Author: A U Thor <author@example.com> |
||||
Date: Mon Jun 26 00:03:00 2006 +0000 |
||||
|
||||
Side |
||||
|
||||
diff --git a/dir/sub b/dir/sub |
||||
index 35d242b..7289e35 100644 |
||||
--- a/dir/sub |
||||
+++ b/dir/sub |
||||
@@ -1,2 +1,4 @@ |
||||
A |
||||
B |
||||
+1 |
||||
+2 |
||||
diff --git a/file0 b/file0 |
||||
index 01e79c3..f4615da 100644 |
||||
--- a/file0 |
||||
+++ b/file0 |
||||
@@ -1,3 +1,6 @@ |
||||
1 |
||||
2 |
||||
3 |
||||
+A |
||||
+B |
||||
+C |
||||
diff --git a/file3 b/file3 |
||||
new file mode 100644 |
||||
index 0000000..7289e35 |
||||
--- /dev/null |
||||
+++ b/file3 |
||||
@@ -0,0 +1,4 @@ |
||||
+A |
||||
+B |
||||
+1 |
||||
+2 |
||||
|
||||
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 |
||||
Author: A U Thor <author@example.com> |
||||
Date: Mon Jun 26 00:02:00 2006 +0000 |
||||
|
||||
Third |
||||
|
||||
diff --git a/dir/sub b/dir/sub |
||||
index 8422d40..cead32e 100644 |
||||
--- a/dir/sub |
||||
+++ b/dir/sub |
||||
@@ -2,3 +2,5 @@ A |
||||
B |
||||
C |
||||
D |
||||
+E |
||||
+F |
||||
diff --git a/file1 b/file1 |
||||
new file mode 100644 |
||||
index 0000000..b1e6722 |
||||
--- /dev/null |
||||
+++ b/file1 |
||||
@@ -0,0 +1,3 @@ |
||||
+A |
||||
+B |
||||
+C |
||||
|
||||
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 |
||||
Author: A U Thor <author@example.com> |
||||
Date: Mon Jun 26 00:01:00 2006 +0000 |
||||
|
||||
Second |
||||
|
||||
This is the second commit. |
||||
|
||||
diff --git a/dir/sub b/dir/sub |
||||
index 35d242b..8422d40 100644 |
||||
--- a/dir/sub |
||||
+++ b/dir/sub |
||||
@@ -1,2 +1,4 @@ |
||||
A |
||||
B |
||||
+C |
||||
+D |
||||
diff --git a/file0 b/file0 |
||||
index 01e79c3..b414108 100644 |
||||
--- a/file0 |
||||
+++ b/file0 |
||||
@@ -1,3 +1,6 @@ |
||||
1 |
||||
2 |
||||
3 |
||||
+4 |
||||
+5 |
||||
+6 |
||||
diff --git a/file2 b/file2 |
||||
deleted file mode 100644 |
||||
index 01e79c3..0000000 |
||||
--- a/file2 |
||||
+++ /dev/null |
||||
@@ -1,3 +0,0 @@ |
||||
-1 |
||||
-2 |
||||
-3 |
||||
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a |
||||
Author: A U Thor <author@example.com> |
||||
Date: Mon Jun 26 00:00:00 2006 +0000 |
||||
|
||||
Initial |
||||
$ |
@ -0,0 +1,200 @@
@@ -0,0 +1,200 @@
|
||||
$ git log -c -m -p master |
||||
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0) |
||||
Merge: 9a6d494 c7a2ab9 |
||||
Author: A U Thor <author@example.com> |
||||
Date: Mon Jun 26 00:04:00 2006 +0000 |
||||
|
||||
Merge branch 'side' |
||||
|
||||
diff --git a/dir/sub b/dir/sub |
||||
index cead32e..992913c 100644 |
||||
--- a/dir/sub |
||||
+++ b/dir/sub |
||||
@@ -4,3 +4,5 @@ C |
||||
D |
||||
E |
||||
F |
||||
+1 |
||||
+2 |
||||
diff --git a/file0 b/file0 |
||||
index b414108..10a8a9f 100644 |
||||
--- a/file0 |
||||
+++ b/file0 |
||||
@@ -4,3 +4,6 @@ |
||||
4 |
||||
5 |
||||
6 |
||||
+A |
||||
+B |
||||
+C |
||||
|
||||
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a) |
||||
Merge: 9a6d494 c7a2ab9 |
||||
Author: A U Thor <author@example.com> |
||||
Date: Mon Jun 26 00:04:00 2006 +0000 |
||||
|
||||
Merge branch 'side' |
||||
|
||||
diff --git a/dir/sub b/dir/sub |
||||
index 7289e35..992913c 100644 |
||||
--- a/dir/sub |
||||
+++ b/dir/sub |
||||
@@ -1,4 +1,8 @@ |
||||
A |
||||
B |
||||
+C |
||||
+D |
||||
+E |
||||
+F |
||||
1 |
||||
2 |
||||
diff --git a/file0 b/file0 |
||||
index f4615da..10a8a9f 100644 |
||||
--- a/file0 |
||||
+++ b/file0 |
||||
@@ -1,6 +1,9 @@ |
||||
1 |
||||
2 |
||||
3 |
||||
+4 |
||||
+5 |
||||
+6 |
||||
A |
||||
B |
||||
C |
||||
diff --git a/file1 b/file1 |
||||
new file mode 100644 |
||||
index 0000000..b1e6722 |
||||
--- /dev/null |
||||
+++ b/file1 |
||||
@@ -0,0 +1,3 @@ |
||||
+A |
||||
+B |
||||
+C |
||||
diff --git a/file2 b/file2 |
||||
deleted file mode 100644 |
||||
index 01e79c3..0000000 |
||||
--- a/file2 |
||||
+++ /dev/null |
||||
@@ -1,3 +0,0 @@ |
||||
-1 |
||||
-2 |
||||
-3 |
||||
diff --git a/file3 b/file3 |
||||
deleted file mode 100644 |
||||
index 7289e35..0000000 |
||||
--- a/file3 |
||||
+++ /dev/null |
||||
@@ -1,4 +0,0 @@ |
||||
-A |
||||
-B |
||||
-1 |
||||
-2 |
||||
|
||||
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a |
||||
Author: A U Thor <author@example.com> |
||||
Date: Mon Jun 26 00:03:00 2006 +0000 |
||||
|
||||
Side |
||||
|
||||
diff --git a/dir/sub b/dir/sub |
||||
index 35d242b..7289e35 100644 |
||||
--- a/dir/sub |
||||
+++ b/dir/sub |
||||
@@ -1,2 +1,4 @@ |
||||
A |
||||
B |
||||
+1 |
||||
+2 |
||||
diff --git a/file0 b/file0 |
||||
index 01e79c3..f4615da 100644 |
||||
--- a/file0 |
||||
+++ b/file0 |
||||
@@ -1,3 +1,6 @@ |
||||
1 |
||||
2 |
||||
3 |
||||
+A |
||||
+B |
||||
+C |
||||
diff --git a/file3 b/file3 |
||||
new file mode 100644 |
||||
index 0000000..7289e35 |
||||
--- /dev/null |
||||
+++ b/file3 |
||||
@@ -0,0 +1,4 @@ |
||||
+A |
||||
+B |
||||
+1 |
||||
+2 |
||||
|
||||
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 |
||||
Author: A U Thor <author@example.com> |
||||
Date: Mon Jun 26 00:02:00 2006 +0000 |
||||
|
||||
Third |
||||
|
||||
diff --git a/dir/sub b/dir/sub |
||||
index 8422d40..cead32e 100644 |
||||
--- a/dir/sub |
||||
+++ b/dir/sub |
||||
@@ -2,3 +2,5 @@ A |
||||
B |
||||
C |
||||
D |
||||
+E |
||||
+F |
||||
diff --git a/file1 b/file1 |
||||
new file mode 100644 |
||||
index 0000000..b1e6722 |
||||
--- /dev/null |
||||
+++ b/file1 |
||||
@@ -0,0 +1,3 @@ |
||||
+A |
||||
+B |
||||
+C |
||||
|
||||
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 |
||||
Author: A U Thor <author@example.com> |
||||
Date: Mon Jun 26 00:01:00 2006 +0000 |
||||
|
||||
Second |
||||
|
||||
This is the second commit. |
||||
|
||||
diff --git a/dir/sub b/dir/sub |
||||
index 35d242b..8422d40 100644 |
||||
--- a/dir/sub |
||||
+++ b/dir/sub |
||||
@@ -1,2 +1,4 @@ |
||||
A |
||||
B |
||||
+C |
||||
+D |
||||
diff --git a/file0 b/file0 |
||||
index 01e79c3..b414108 100644 |
||||
--- a/file0 |
||||
+++ b/file0 |
||||
@@ -1,3 +1,6 @@ |
||||
1 |
||||
2 |
||||
3 |
||||
+4 |
||||
+5 |
||||
+6 |
||||
diff --git a/file2 b/file2 |
||||
deleted file mode 100644 |
||||
index 01e79c3..0000000 |
||||
--- a/file2 |
||||
+++ /dev/null |
||||
@@ -1,3 +0,0 @@ |
||||
-1 |
||||
-2 |
||||
-3 |
||||
|
||||
commit 444ac553ac7612cc88969031b02b3767fb8a353a |
||||
Author: A U Thor <author@example.com> |
||||
Date: Mon Jun 26 00:00:00 2006 +0000 |
||||
|
||||
Initial |
||||
$ |
Loading…
Reference in new issue