summaryrefslogtreecommitdiff
path: root/t/t4013/diff.format-patch_--stdout_initial..master^
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-14 02:51:12 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-14 04:40:43 (GMT)
commita40d384caca008c0334a35e9ac298f2eeb5decd2 (patch)
treef7bd59d2277de5ca9ae8c8304126f44e96c7b455 /t/t4013/diff.format-patch_--stdout_initial..master^
parent5716e794bf12ad9740da41d06c94e2771fe9e0ee (diff)
downloadgit-a40d384caca008c0334a35e9ac298f2eeb5decd2.zip
git-a40d384caca008c0334a35e9ac298f2eeb5decd2.tar.gz
git-a40d384caca008c0334a35e9ac298f2eeb5decd2.tar.bz2
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>
Diffstat (limited to 't/t4013/diff.format-patch_--stdout_initial..master^')
-rw-r--r--t/t4013/diff.format-patch_--stdout_initial..master^6
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t4013/diff.format-patch_--stdout_initial..master^ b/t/t4013/diff.format-patch_--stdout_initial..master^
index e56dd98..4e87689 100644
--- a/t/t4013/diff.format-patch_--stdout_initial..master^
+++ b/t/t4013/diff.format-patch_--stdout_initial..master^
@@ -1,8 +1,10 @@
$ git format-patch --stdout initial..master^
-From 7952a93e09bf565b5592766a438b40cd81f4846f Mon Sep 17 00:00:00 2001
+From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
From: A U Thor <author@example.com>
Date: Mon, 26 Jun 2006 00:01:00 +0000
Subject: [PATCH] Second
+
+This is the second commit.
---
dir/sub | 2 ++
file0 | 3 +++
@@ -42,7 +44,7 @@ index 01e79c3..0000000
g-i-t--v-e-r-s-i-o-n
-From 889b315013ef9f2e2f90aa0b054b267c8a557847 Mon Sep 17 00:00:00 2001
+From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001
From: A U Thor <author@example.com>
Date: Mon, 26 Jun 2006 00:02:00 +0000
Subject: [PATCH] Third