From ef93b370ae63a33e82e75cc7b0486c3f9189e50c Mon Sep 17 00:00:00 2001
From: Michal Hocko <mhocko@suse.com>
Date: Mar 27 2024 10:29:06 +0000
Subject: scripts/common-functions: sha_in_upstream refinements.


---

diff --git a/scripts/common-functions b/scripts/common-functions
index b24de9a..43c8246 100644
--- a/scripts/common-functions
+++ b/scripts/common-functions
@@ -170,18 +170,18 @@ sha_merged_in_upstream_tag()
     [ -z "$base" ] && fail "sha_merged_in_upstream_tag: No base provided"
     [ -z "$upstream_git" ] && fail "sha_merged_in_upstream_tag: No upstream git tree"
 
-    git --git-dir="$LINUX_GIT/.git" merge-base --is-ancestor "$sha" "$base"
+    git --git-dir="$LINUX_GIT/.git" merge-base --is-ancestor "$sha" "$base" 2>/dev/null
 }
 
 sha_in_upstream()
 {
     local sha=$1
-    local upstream_git=${3:-$LINUX_GIT}
+    local upstream_git=${2:-$LINUX_GIT}
 
     [ -z "$sha" ] && fail "sha_in_upstream: No sha provided"
     [ -z "$upstream_git" ] && fail "sha_in_upstream: No upstream git tree"
 
-    sha_merged_in_upstream_tag $sha origin/HEAD $upstream_git 2>/dev/null
+    sha_merged_in_upstream_tag $sha origin/HEAD $upstream_git
 }