зеркало из https://github.com/microsoft/git.git
t5703: simplify one-time-sed generation logic
In inconsistency(), we had two `git rev-parse` invocations in the upstream of a pipe within a command substitution. In case this invocation ever failed, its exit code would be swallowed up and we would not know about it. Pull the command substitutions out into variable assignments so that their return codes are not lost. Drop the pipe into `tr` because the $(...) substitution already takes care of stripping out newlines, so the `tr` invocations in the code are superfluous. Finally, given the way the tests actually employ "one-time-sed" via $(cat one-time-sed) in t/lib-httpd/apply-one-time-sed.sh, convert the `printf` into an `echo`. This makes it consistent with the final "server loses a ref - ref in want" test, which does use `echo` rather than `printf`. Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
a29b2429e5
Коммит
eacaa1c180
|
@ -312,10 +312,9 @@ inconsistency () {
|
|||
# repository appears to change during negotiation, for example, when
|
||||
# different servers in a load-balancing arrangement serve (stateless)
|
||||
# RPCs during a single negotiation.
|
||||
printf "s/%s/%s/" \
|
||||
$(git -C "$REPO" rev-parse $1 | tr -d "\n") \
|
||||
$(git -C "$REPO" rev-parse $2 | tr -d "\n") \
|
||||
>"$HTTPD_ROOT_PATH/one-time-sed"
|
||||
oid1=$(git -C "$REPO" rev-parse $1) &&
|
||||
oid2=$(git -C "$REPO" rev-parse $2) &&
|
||||
echo "s/$oid1/$oid2/" >"$HTTPD_ROOT_PATH/one-time-sed"
|
||||
}
|
||||
|
||||
test_expect_success 'server is initially ahead - no ref in want' '
|
||||
|
|
Загрузка…
Ссылка в новой задаче