undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t3903: abstract away SHA-1-specific constants

Browse Source 
Abstract away the SHA-1-specific constants by sanitizing diff output to
remove the index lines, since it's clear from the assertions in question
that we are not interested in the specific object IDs.

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 2019-08-26 01:43:41 +00:00 committed by Junio C Hamano
parent acb49d1cc8
commit c784815073
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
t/t3903-stash.sh
View File

@ -7,6 +7,18 @@ test_description='Test git stash'
. ./test-lib.sh
diff_cmp () {
for i in "$1" "$2"
do
sed -e 's/^index 0000000\.\.[0-9a-f]*/index 0000000..1234567/' \
-e 's/^index [0-9a-f]*\.\.[0-9a-f]*/index 1234567..89abcde/' \
-e 's/^index [0-9a-f]*,[0-9a-f]*\.\.[0-9a-f]*/index 1234567,7654321..89abcde/' \
"$i" >"$i.compare" || return 1
done &&
test_cmp "$1.compare" "$2.compare" &&
rm -f "$1.compare" "$2.compare"
}
test_expect_success 'stash some dirty working directory' '
echo 1 >file &&
git add file &&
@ -36,7 +48,7 @@ EOF
test_expect_success 'parents of stash' '
test $(git rev-parse stash^) = $(git rev-parse HEAD) &&
git diff stash^2..stash >output &&
test_cmp expect output
diff_cmp expect output
'
test_expect_success 'applying bogus stash does nothing' '
@ -210,13 +222,13 @@ test_expect_success 'stash branch' '
test refs/heads/stashbranch = $(git symbolic-ref HEAD) &&
test $(git rev-parse HEAD) = $(git rev-parse master^) &&
git diff --cached >output &&
test_cmp expect output &&
diff_cmp expect output &&
git diff >output &&
test_cmp expect1 output &&
diff_cmp expect1 output &&
git add file &&
git commit -m alternate\ second &&
git diff master..stashbranch >output &&
test_cmp output expect2 &&
diff_cmp output expect2 &&
test 0 = $(git stash list | wc -l)
'
@ -577,7 +589,7 @@ test_expect_success 'stash show -p - stashes on stack, stash-like argument' '
+bar
EOF
git stash show -p ${STASH_ID} >actual &&
test_cmp expected actual
diff_cmp expected actual
'
test_expect_success 'stash show - no stashes on stack, stash-like argument' '
@ -609,7 +621,7 @@ test_expect_success 'stash show -p - no stashes on stack, stash-like argument' '
+foo
EOF
git stash show -p ${STASH_ID} >actual &&
test_cmp expected actual
diff_cmp expected actual
'
test_expect_success 'stash show --patience shows diff' '
@ -627,7 +639,7 @@ test_expect_success 'stash show --patience shows diff' '
+foo
EOF
git stash show --patience ${STASH_ID} >actual &&
test_cmp expected actual
diff_cmp expected actual
'
test_expect_success 'drop: fail early if specified stash is not a stash ref' '
@ -791,7 +803,7 @@ test_expect_success 'stash where working directory contains "HEAD" file' '
git diff-index --cached --quiet HEAD &&
test "$(git rev-parse stash^)" = "$(git rev-parse HEAD)" &&
git diff stash^..stash >output &&
test_cmp expect output
diff_cmp expect output
'
test_expect_success 'store called with invalid commit' '
@ -847,7 +859,7 @@ test_expect_success 'stash list implies --first-parent -m' '
+working
EOF
git stash list --format=%gd -p >actual &&
test_cmp expect actual
diff_cmp expect actual
'
test_expect_success 'stash list --cc shows combined diff' '
@ -864,7 +876,7 @@ test_expect_success 'stash list --cc shows combined diff' '
++working
EOF
git stash list --format=%gd -p --cc >actual &&
test_cmp expect actual
diff_cmp expect actual
'
test_expect_success 'stash is not confused by partial renames' '