summaryrefslogtreecommitdiff
path: root/t/t4013-diff-various.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-26 23:29:11 -0700
committerJunio C Hamano <junkio@cox.net>2006-06-26 23:29:11 -0700
commit47979d5d5bb86d058dce77801648734abe1e593b (patch)
tree6f24fbff1c2842c0febf3301ab4cb962c3305953 /t/t4013-diff-various.sh
parent3c2f75b590c35675cc67dc43cabe2298bec86afc (diff)
downloadgit-47979d5d5bb86d058dce77801648734abe1e593b.tar.gz
t4013: add more tests around -c and --cc
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t4013-diff-various.sh')
-rwxr-xr-xt/t4013-diff-various.sh28
1 files changed, 25 insertions, 3 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 802e0ba01d..22984e3db7 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -163,6 +163,22 @@ diff-tree -p -m master
diff-tree -c master
diff-tree -c --abbrev master
diff-tree --cc master
+# stat only should show the diffstat with the first parent
+diff-tree -c --stat master
+diff-tree --cc --stat master
+diff-tree -c --stat --summary master
+diff-tree --cc --stat --summary master
+# stat summary should show the diffstat and summary with the first parent
+diff-tree -c --stat --summary side
+diff-tree --cc --stat --summary side
+# this one gives an extra newline after stat, which should be removed
+# diff-tree --cc --patch-with-stat master
+# this one gives an extra newline after stat, which should be removed
+# other than that it shows the correct example -- stat and summary are
+# against the first parent, and patch-looking combined diff follows.
+diff-tree --cc --patch-with-stat --summary master
+# this is correct
+diff-tree --cc --patch-with-stat --summary side
log master
log -p master
@@ -170,8 +186,11 @@ log --root master
log --root -p master
log --patch-with-stat master
log --root --patch-with-stat master
-#log --root --patch-with-stat --summary master
+log --root --patch-with-stat --summary master
+log --root -c --patch-with-stat --summary master
+log --root --cc --patch-with-stat --summary master
log -SF master
+log -SF -p master
whatchanged master
whatchanged -p master
@@ -180,10 +199,15 @@ whatchanged --root -p master
whatchanged --patch-with-stat master
whatchanged --root --patch-with-stat master
whatchanged --root --patch-with-stat --summary master
+whatchanged --root -c --patch-with-stat --summary master
+whatchanged --root --cc --patch-with-stat --summary master
whatchanged -SF master
+whatchanged -SF -p master
log --patch-with-stat master -- dir/
whatchanged --patch-with-stat master -- dir/
+log --patch-with-stat --summary master -- dir/
+whatchanged --patch-with-stat --summary master -- dir/
show initial
show --root initial
@@ -195,8 +219,6 @@ show --patch-with-stat side
show --patch-with-raw side
show --patch-with-stat --summary side
-
-
EOF
test_done