Commit Diff


commit - 3e8bd23d445742d36f81ca8e61277581812a9554b76f57783d67450f81e3efb7
commit + fba864f0174087aefc41b13bc22a15c538dd4a85811273c2ec8b39fc33046492
blob - b736ae01a84b400eb4cd2f4934a799479d39a9813277e32f27424eec36db081f
blob + c0cac4902ee3dd54a9605593b665a3202c1cd769c7516ced94406fa1113d81b7
--- regress/tog/common.sh	
+++ regress/tog/common.sh	
@@ -42,14 +42,18 @@ widechar_file_content()
 	EOF
 }
 
-widechar_logmsg()
+widechar_logmsg1()
 {
-	cat <<-EOF
-	選り抜き記事ウィリアム・ユワート・グラッドストン(英語: William Ewart Gladstone PC FRS FSS、1809年12月29日 - 1898年5月19日)は、イギリスの政治家。
+cat <<-EOF
+選り抜き記事ウィリアム・ユワート・グラッドストン(英語: William Ewart Gladstone PC FRS FSS、1809年12月29日 - 1898年5月19日)は、イギリスの政治家。
+EOF
+}
 
-
-	    良質な記事 おまかせ表示 つまみ読み 選考
-	EOF
+widechar_logmsg2()
+{
+cat <<-EOF
+良質な記事 おまかせ表示 つまみ読み 選考
+EOF
 }
 
 widechar_commit()
@@ -59,7 +63,10 @@ widechar_commit()
 	echo "$(widechar_file_content)" > $repo/$(widechar_filename)
 
 	(cd $repo && git add $(widechar_filename) > /dev/null)
-	(cd $repo && git commit -q --cleanup=verbatim -m "$(widechar_logmsg)" \
+	widechar_logmsg1 > $testroot/logmsg
+	echo >> $testroot/logmsg
+	widechar_logmsg2 >> $testroot/logmsg
+	(cd $repo && git commit -q --cleanup=verbatim -F $testroot/logmsg \
 	    > /dev/null)
 }
 
blob - 21fbb7ff68775faf4cb6cc05abdcddb8ac4aa3501fd6b37c59d6ce952e139529
blob + 5324f75510d7ed8f0e22bc723047e8182a7ec738d74a59986e6c0f84e617da7e
--- regress/tog/diff.sh	
+++ regress/tog/diff.sh	
@@ -41,7 +41,7 @@ commit $head_id (master)
 from: Flan Hacker <flan_hacker@openbsd.org>
 date: $date
 
-changed alpha
+ changed alpha
 
 M  alpha  |  1+  1-
 
@@ -191,7 +191,7 @@ commit $id7
 from: Flan Hacker <flan_hacker@openbsd.org>
 date: $date7
 
-7
+ 7
 
 M  alpha  |  1+  1-
 
@@ -239,7 +239,7 @@ commit $id26
 from: Flan Hacker <flan_hacker@openbsd.org>
 date: $date26
 
-26
+ 26
 
 M  alpha  |  1+  1-
 
@@ -287,7 +287,7 @@ commit $id7
 from: Flan Hacker <flan_hacker@openbsd.org>
 date: $date7
 
-7
+ 7
 
 M  alpha  |  1+  1-
 
@@ -375,7 +375,7 @@ test_diff_commit_keywords()
 	from: Flan Hacker <flan_hacker@openbsd.org>
 	date: $date
 
-	commit 1
+	 commit 1
 
 	M  alpha  |  1+  1-
 
@@ -456,7 +456,7 @@ test_diff_commit_keywords()
 	from: Flan Hacker <flan_hacker@openbsd.org>
 	date: $date
 
-	commit 8
+	 commit 8
 
 	M  alpha  |  1+  1-
 
@@ -519,8 +519,8 @@ $(trim 80 "[1/20] diff $commit_id1 $head_id_truncated"
 Flan Hacker <flan_hacker@openbsd.org>
 $date
 
+l
 
-
 ha  |  1+  0-
 
  changed, 1 insertion(+), 0 deletions(-)
@@ -582,9 +582,9 @@ test_diff_p_keymap()
 commit $id_head (master)
 from: Flan Hacker <flan_hacker@openbsd.org>
 date: $date_head
-
-modified beta
-
+ 
+ modified beta
+ 
 M  beta  |  1+  1-
 
 1 file changed, 1 insertion(+), 1 deletion(-)
blob - bee35a0cc4d47551c8e1520a03d7e064f4f0dbe48845c65b8b2dcb74726f33e1
blob + 7413bcd525bcb38ed971c344a0803721a70aa909640888977d127e9db47f7064
--- regress/tog/log.sh	
+++ regress/tog/log.sh	
@@ -44,7 +44,7 @@ commit $head_id (master)
 from: Flan Hacker <flan_hacker@openbsd.org>
 date: $date
 
-adding the test tree
+ adding the test tree
 
 A  alpha         |  1+  0-
 A  beta          |  1+  0-
@@ -93,7 +93,7 @@ $ymd flan_hacker  [master] adding the test tree       
                                                              |from: Flan Hacker <flan_hacker@openbsd.org>
                                                              |date: $date
                                                              |
-                                                             |adding the test tree
+                                                             | adding the test tree
                                                              |
                                                              |A  alpha         |  1+  0-
                                                              |A  beta          |  1+  0-
@@ -356,12 +356,14 @@ SCREENDUMP
 EOF
 
 	cat <<EOF >$testroot/view.expected
-[1/26] diff $commit1 $head_id
+[1/25] diff $commit1 $head_id
 commit $head_id (master)
 from: Flan Hacker <flan_hacker@openbsd.org>
 date: $date
 
-$(widechar_logmsg)
+ $(widechar_logmsg1)
+$(echo)
+ $(widechar_logmsg2)
 
 A  $(widechar_filename)  |  5+  0-
 
@@ -382,6 +384,7 @@ blob + $blobid (mode 644)
 
 
 
+
 (END)
 EOF