From ca8e23ed231ea7ed66dadc199ae4b3e5d8b00d1a Mon Sep 17 00:00:00 2001 From: ru-sh Date: Tue, 22 Sep 2026 10:38:04 +0400 Subject: [PATCH] Report which patch failed to apply --- ci/build/update-vscode.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ci/build/update-vscode.sh b/ci/build/update-vscode.sh index b3b4857d2eb4..53bf4f7302ed 100755 --- a/ci/build/update-vscode.sh +++ b/ci/build/update-vscode.sh @@ -41,14 +41,21 @@ function update_vscode() { function refresh_patches() { local -i exit_code=0 - while quiet quilt push 2>&1 ; ! (( exit_code=$? )) ; do + local output="" + # quilt names the patch that failed on stdout, so capture that output and + # print it on failure. Sending it to /dev/null leaves a conflict showing up + # as a bare exit code with no indication of which patch broke. + while output=$(quilt push 2>&1) ; ! (( exit_code=$? )) ; do quilt refresh 2>&1 done case $exit_code in # No more patches to apply. 2) ;; # Some error. - *) return $exit_code ;; + *) + echo "$output" + return $exit_code + ;; esac }