mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t3702: abstract away SHA-1-specific constants

Browse Source 
Strip out the index lines in the diff before comparing them, as these
will differ between hash algorithms.  This leads to a smaller, simpler
change than editing the index line.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
2018-05-21 02:01:32 +00:00
committed by Junio C Hamano
parent 831c61cc6b
commit 18cb8231b3
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
t/t3702-add-edit.sh
View File

@ -40,7 +40,6 @@ test_expect_success 'setup' '
cat > expected-patch << EOF cat > expected-patch << EOF
diff --git a/file b/file diff --git a/file b/file
index b9834b5..9020acb 100644
--- a/file --- a/file
+++ b/file +++ b/file
@@ -1,11 +1,6 @@ @@ -1,11 +1,6 @@
@ -80,7 +79,6 @@ EOF
cat > expected << EOF cat > expected << EOF
diff --git a/file b/file diff --git a/file b/file
index b9834b5..ef6e94c 100644
--- a/file --- a/file
+++ b/file +++ b/file
@@ -1,10 +1,12 @@ @@ -1,10 +1,12 @@
@ -100,7 +98,7 @@ EOF
echo "#!$SHELL_PATH" >fake-editor.sh echo "#!$SHELL_PATH" >fake-editor.sh
cat >> fake-editor.sh <<\EOF cat >> fake-editor.sh <<\EOF
mv -f "$1" orig-patch && egrep -v '^index' "$1" >orig-patch &&
mv -f patch "$1" mv -f patch "$1"
EOF EOF
@ -113,7 +111,8 @@ test_expect_success 'add -e' '
git add -e && git add -e &&
test_cmp second-part file && test_cmp second-part file &&
test_cmp orig-patch expected-patch && test_cmp orig-patch expected-patch &&
git diff --cached > out && git diff --cached >actual &&
grep -v index actual >out &&
test_cmp out expected test_cmp out expected
' '