From 7c5af1509551cd5649093e379151be238a67def3 Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <eb@emlix.com>
Date: Fri, 9 Feb 2024 13:04:57 +0100
Subject: [PATCH] fix message when local and remote tags differ

The check for "local tag not found" was wrongly copying the later check for
tag mismatch, so when the tags did not match this message was shown:

  Error [2]: verifying remote tag
  Error [3]: can not find commit ID for local tag "v6.6" in ".../in/linux/.git"

Now it correctly shows:

  Error [2]: verifying remote tag
        [2]: local tag differs from remote tag
  tag name: v6.6
  local:  6e815efe19a99a33b16cc720c3d3a727565a4fa1
  remote: 5260836abb7056beed3f3f0d0e4262c11f36f0d0

Signed-off-by: Rolf Eike Beer <eb@emlix.com>
---
 Changelog               | 1 +
 generic/generic_git.lua | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index 64187a5..c61abcd 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 NEXT:
+ * fix message when local and remote tags differ
 
 e2factory-2.3.18p1
  * add support for rsync 3.2.4 style path arguments
diff --git a/generic/generic_git.lua b/generic/generic_git.lua
index 865b940..d958a04 100644
--- a/generic/generic_git.lua
+++ b/generic/generic_git.lua
@@ -788,7 +788,7 @@ function generic_git.verify_remote_tag(gitdir, tag)
         return false, e:cat(re)
     end
 
-    if rid ~= lid then
+    if not lid then
         re = err.new("can not find commit ID for local tag %q in %q",
             tag, gitdir)
         return false, e:cat(re)
-- 
2.39.5