git/t/t4013/diff.whatchanged_--root_--c...

$ git whatchanged --root --cc --patch-with-stat --summary master
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com>
Date:   Mon Jun 26 00:04:00 2006 +0000

    Merge branch 'side'

 dir/sub |    2 ++
 file0   |    3 +++
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --cc dir/sub
index cead32e,7289e35..992913c
--- a/dir/sub
+++ b/dir/sub
@@@ -1,6 -1,4 +1,8 @@@
  A
  B
 +C
 +D
 +E
 +F
+ 1
+ 2
diff --cc file0
index b414108,f4615da..10a8a9f
--- a/file0
+++ b/file0
@@@ -1,6 -1,6 +1,9 @@@
  1
  2
  3
 +4
 +5
 +6
+ A
+ B
+ C

commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
Author: A U Thor <author@example.com>
Date:   Mon Jun 26 00:03:00 2006 +0000

    Side
---
 dir/sub |    2 ++
 file0   |    3 +++
 file3   |    4 ++++
 3 files changed, 9 insertions(+), 0 deletions(-)
 create mode 100644 file3

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
---
 dir/sub |    2 ++
 file1   |    3 +++
 2 files changed, 5 insertions(+), 0 deletions(-)
 create mode 100644 file1

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.
---
 dir/sub |    2 ++
 file0   |    3 +++
 file2   |    3 ---
 3 files changed, 5 insertions(+), 3 deletions(-)
 delete mode 100644 file2

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
---
 dir/sub |    2 ++
 file0   |    3 +++
 file2   |    3 +++
 3 files changed, 8 insertions(+), 0 deletions(-)
 create mode 100644 dir/sub
 create mode 100644 file0
 create mode 100644 file2

diff --git a/dir/sub b/dir/sub
new file mode 100644
index 0000000..35d242b
--- /dev/null
+++ b/dir/sub
@@ -0,0 +1,2 @@
+A
+B
diff --git a/file0 b/file0
new file mode 100644
index 0000000..01e79c3
--- /dev/null
+++ b/file0
@@ -0,0 +1,3 @@
+1
+2
+3
diff --git a/file2 b/file2
new file mode 100644
index 0000000..01e79c3
--- /dev/null
+++ b/file2
@@ -0,0 +1,3 @@
+1
+2
+3
$
t4013: add more tests around -c and --cc Signed-off-by: Junio C Hamano <junkio@cox.net> 19 years ago			`$ git whatchanged --root --cc --patch-with-stat --summary master`
t4013 diff format tests update This changes one test commit in the sequence to have more than one lines of commit log. A few output formats (--pretty=email aka format-patch and --pretty=oneline) need to behave differently on single and multi-line log, and this change will help catching breakages. Signed-off-by: Junio C Hamano <junkio@cox.net> 19 years ago			`commit 59d314ad6f356dd08601a4cd5e530381da3e3c64`
log: do not print ellipses with --abbrev-commit 'git log --abbrev-commit' added an ellipsis to all commit names that were abbreviated. This was particularly annoying if you wanted to cut&paste the sha1 from the terminal, since selecting by word would pick up '...' too. So use find_unique_abbrev() instead of diff_unique_abbrev() in all log-related commit sha1 printing routines, and also change the formatting of the 'Merge: parent1 parent2' line output via pretty_print_commit(). Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> 16 years ago			`Merge: 9a6d494 c7a2ab9`
t4013: add more tests around -c and --cc Signed-off-by: Junio C Hamano <junkio@cox.net> 19 years ago			`Author: A U Thor <author@example.com>`
			`Date: Mon Jun 26 00:04:00 2006 +0000`

			`Merge branch 'side'`
t4013 test updates for new output code. These are updates to the test vector that shows the "incompatibility" of the new output code. The changes are actually the good ones, so instead of keeping the older output we adjust the test to the new code. Signed-off-by: Junio C Hamano <junkio@cox.net> 19 years ago
t4013: add more tests around -c and --cc Signed-off-by: Junio C Hamano <junkio@cox.net> 19 years ago			`dir/sub \| 2 ++`
			`file0 \| 3 +++`
			`2 files changed, 5 insertions(+), 0 deletions(-)`

			`diff --cc dir/sub`
			`index cead32e,7289e35..992913c`
			`--- a/dir/sub`
			`+++ b/dir/sub`
			`@@@ -1,6 -1,4 +1,8 @@@`
			`A`
			`B`
			`+C`
			`+D`
			`+E`
			`+F`
			`+ 1`
			`+ 2`
			`diff --cc file0`
			`index b414108,f4615da..10a8a9f`
			`--- a/file0`
			`+++ b/file0`
			`@@@ -1,6 -1,6 +1,9 @@@`
			`1`
			`2`
			`3`
			`+4`
			`+5`
			`+6`
			`+ A`
			`+ B`
			`+ C`

			`commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a`
			`Author: A U Thor <author@example.com>`
			`Date: Mon Jun 26 00:03:00 2006 +0000`

			`Side`
			`---`
			`dir/sub \| 2 ++`
			`file0 \| 3 +++`
			`file3 \| 4 ++++`
			`3 files changed, 9 insertions(+), 0 deletions(-)`
			`create mode 100644 file3`

			`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`

t4013 diff format tests update This changes one test commit in the sequence to have more than one lines of commit log. A few output formats (--pretty=email aka format-patch and --pretty=oneline) need to behave differently on single and multi-line log, and this change will help catching breakages. Signed-off-by: Junio C Hamano <junkio@cox.net> 19 years ago			`commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0`
t4013: add more tests around -c and --cc Signed-off-by: Junio C Hamano <junkio@cox.net> 19 years ago			`Author: A U Thor <author@example.com>`
			`Date: Mon Jun 26 00:02:00 2006 +0000`

			`Third`
			`---`
			`dir/sub \| 2 ++`
			`file1 \| 3 +++`
			`2 files changed, 5 insertions(+), 0 deletions(-)`
			`create mode 100644 file1`

			`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`

t4013 diff format tests update This changes one test commit in the sequence to have more than one lines of commit log. A few output formats (--pretty=email aka format-patch and --pretty=oneline) need to behave differently on single and multi-line log, and this change will help catching breakages. Signed-off-by: Junio C Hamano <junkio@cox.net> 19 years ago			`commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44`
t4013: add more tests around -c and --cc Signed-off-by: Junio C Hamano <junkio@cox.net> 19 years ago			`Author: A U Thor <author@example.com>`
			`Date: Mon Jun 26 00:01:00 2006 +0000`

			`Second`
t4013 diff format tests update This changes one test commit in the sequence to have more than one lines of commit log. A few output formats (--pretty=email aka format-patch and --pretty=oneline) need to behave differently on single and multi-line log, and this change will help catching breakages. Signed-off-by: Junio C Hamano <junkio@cox.net> 19 years ago
			`This is the second commit.`
t4013: add more tests around -c and --cc Signed-off-by: Junio C Hamano <junkio@cox.net> 19 years ago			`---`
			`dir/sub \| 2 ++`
			`file0 \| 3 +++`
			`file2 \| 3 ---`
			`3 files changed, 5 insertions(+), 3 deletions(-)`
			`delete mode 100644 file2`

			`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`
			`---`
			`dir/sub \| 2 ++`
			`file0 \| 3 +++`
			`file2 \| 3 +++`
			`3 files changed, 8 insertions(+), 0 deletions(-)`
			`create mode 100644 dir/sub`
			`create mode 100644 file0`
			`create mode 100644 file2`

			`diff --git a/dir/sub b/dir/sub`
			`new file mode 100644`
			`index 0000000..35d242b`
			`--- /dev/null`
			`+++ b/dir/sub`
			`@@ -0,0 +1,2 @@`
			`+A`
			`+B`
			`diff --git a/file0 b/file0`
			`new file mode 100644`
			`index 0000000..01e79c3`
			`--- /dev/null`
			`+++ b/file0`
			`@@ -0,0 +1,3 @@`
			`+1`
			`+2`
			`+3`
			`diff --git a/file2 b/file2`
			`new file mode 100644`
			`index 0000000..01e79c3`
			`--- /dev/null`
			`+++ b/file2`
			`@@ -0,0 +1,3 @@`
			`+1`
			`+2`
			`+3`
			`$`