Skip to main content

Browse the archive

Revision 1855c044629a02488baa1bd25ae45341da33bd4e authored by Junio C Hamano on 09 July 2005, 02:27:15 UTC, committed by Linus Torvalds on 09 July 2005, 02:48:44 UTC 
[PATCH] format-patch: fix skipping of blank-lines
 
If it is fed a commit with more than one leading blank lines,
the sed scripts git-format-patch-script used looped forever.
Using git-stripspace upfront makes the sed script somewhat
simpler to work around this problem.

Also use git-rev-parse so that we can say

    $ git-format-patch-script HEAD^^^^

to prepare the latest four patches for e-mail submission.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
1 parent ed61604
Raw File
t4001-diff-rename.sh 
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#

test_description='Test rename detection in diff engine.

'
. ./test-lib.sh

echo >path0 'Line 1
Line 2
Line 3
Line 4
Line 5
Line 6
Line 7
Line 8
Line 9
Line 10
line 11
Line 12
Line 13
Line 14
Line 15
'

test_expect_success \
    'update-cache --add a file.' \
    'git-update-cache --add path0'

test_expect_success \
    'write that tree.' \
    'tree=$(git-write-tree) && echo $tree'

sed -e 's/line/Line/' <path0 >path1
rm -f path0
test_expect_success \
    'renamed and edited the file.' \
    'git-update-cache --add --remove path0 path1'

test_expect_success \
    'git-diff-cache -p -M after rename and editing.' \
    'git-diff-cache -p -M $tree >current'
cat >expected <<\EOF
diff --git a/path0 b/path1
rename from path0
rename to path1
--- a/path0
+++ b/path1
@@ -8,7 +8,7 @@ Line 7
 Line 8
 Line 9
 Line 10
-line 11
+Line 11
 Line 12
 Line 13
 Line 14
EOF

test_expect_success \
    'validate the output.' \
    'diff -I "similarity.*" >/dev/null current expected'

test_done
back to top