From: Andrey Albershteyn <aalbersh@redhat.com>
Date: Thu, 20 Feb 2025 17:56:01 +0000 (+0100)
Subject: libxfs-apply: fix stgit detection
X-Git-Tag: v6.14.0~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8682be1ab7fdb99940437bbedc27146664556d48;p=thirdparty%2Fxfsprogs-dev.git

libxfs-apply: fix stgit detection

stgit top doesn't seem to return 0 if stack is created for a branch
but no patches applied. The code is 2 as when no 'stgit init' was
run.

Replace top with log which always has at least "initialize" action.

Stacked Git 2.4.12

Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Andrey Albershteyn <aalbersh@kernel.org>
---

diff --git a/tools/libxfs-apply b/tools/libxfs-apply
index 097a695f9..480b862d0 100755
--- a/tools/libxfs-apply
+++ b/tools/libxfs-apply
@@ -100,7 +100,7 @@ if [ $? -eq 0 ]; then
 fi
 
 # Are we using stgit? This works even if no patch is applied.
-stg top &> /dev/null
+stg log &> /dev/null
 if [ $? -eq 0 ]; then
 	STGIT=1
 fi