62f3a45bb4
Fix code added in b319ef70a9 (Add a small patch-mode testing library,
2009-08-13) to use &&-chaining.
This avoids losing both the exit code of a "git" and the "cat"
processes.
This fixes cases where we'd have e.g. missed memory leaks under
SANITIZE=leak, this code doesn't leak now as far as I can tell, but I
discovered it while looking at leaks in related code.
For "verify_saved_head()" we could make use of "test_cmp_rev" with
some changes, but it uses "git rev-parse --verify", and this existing
test does not. I think it could safely use it, but let's avoid the
while-at-it change, and narrowly fix the exit code problem.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
56 lines
1.2 KiB
Bash
56 lines
1.2 KiB
Bash
: included from t2016 and others
|
|
|
|
. ./test-lib.sh
|
|
|
|
# set_state <path> <worktree-content> <index-content>
|
|
#
|
|
# Prepare the content for path in worktree and the index as specified.
|
|
set_state () {
|
|
echo "$3" > "$1" &&
|
|
git add "$1" &&
|
|
echo "$2" > "$1"
|
|
}
|
|
|
|
# save_state <path>
|
|
#
|
|
# Save index/worktree content of <path> in the files _worktree_<path>
|
|
# and _index_<path>
|
|
save_state () {
|
|
noslash="$(echo "$1" | tr / _)" &&
|
|
cat "$1" > _worktree_"$noslash" &&
|
|
git show :"$1" > _index_"$noslash"
|
|
}
|
|
|
|
# set_and_save_state <path> <worktree-content> <index-content>
|
|
set_and_save_state () {
|
|
set_state "$@" &&
|
|
save_state "$1"
|
|
}
|
|
|
|
# verify_state <path> <expected-worktree-content> <expected-index-content>
|
|
verify_state () {
|
|
echo "$2" >expect &&
|
|
test_cmp expect "$1" &&
|
|
|
|
echo "$3" >expect &&
|
|
git show :"$1" >actual &&
|
|
test_cmp expect actual
|
|
}
|
|
|
|
# verify_saved_state <path>
|
|
#
|
|
# Call verify_state with expected contents from the last save_state
|
|
verify_saved_state () {
|
|
noslash="$(echo "$1" | tr / _)" &&
|
|
verify_state "$1" "$(cat _worktree_"$noslash")" "$(cat _index_"$noslash")"
|
|
}
|
|
|
|
save_head () {
|
|
git rev-parse HEAD > _head
|
|
}
|
|
|
|
verify_saved_head () {
|
|
git rev-parse HEAD >actual &&
|
|
test_cmp _head actual
|
|
}
|