Re: [PATCH 1/2] request-pull: simplify "remote or HEAD" variable in warning messages
From: Paolo Bonzini <pbonzini@redhat.com>
Date: 2021-09-16 13:09:47
On 16/09/21 13:35, Bagas Sanjaya wrote:
In order for waring message "Are you sure you pushed 'remote or HEAD'
^^^^^^ warning Otherwise, Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
quoted hunk ↗ jump to hunk
there?" to be translatable, replace ${remote:-HEAD} (variable access with defaults) in the message by referring it as $remote_or_head. Cc: Ryan Anderson <redacted> Cc: pbonzini@redhat.com Signed-off-by: Bagas Sanjaya <redacted> --- git-request-pull.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)diff --git a/git-request-pull.sh b/git-request-pull.sh index 2d0e44656c..9e1d2be9eb 100755 --- a/git-request-pull.sh +++ b/git-request-pull.sh@@ -116,15 +116,17 @@ set fnord $(git ls-remote "$url" | @@PERL@@ -e "$find_matching_ref" "${remote:-H remote_sha1=$2 ref=$3 +remote_or_head=${remote:-HEAD} + if test -z "$ref" then echo "warn: No match for commit $headrev found at $url" >&2 - echo "warn: Are you sure you pushed '${remote:-HEAD}' there?" >&2 + echo "warn: Are you sure you pushed '$remote_or_head' there?" >&2 status=1 elif test "$local_sha1" != "$remote_sha1" then echo "warn: $head found at $url but points to a different object" >&2 - echo "warn: Are you sure you pushed '${remote:-HEAD}' there?" >&2 + echo "warn: Are you sure you pushed '$remote_or_head' there?" >&2 status=1 fi