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>

diff --git a/Changelog b/Changelog
index 64187a50a0f4228fd35674dfa727881fc64a49dd..c61abcd956f0e95c9d645337c6ce9da687046991 100644 (file)
--- 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 865b94079d6aa9b7f8666059ca47bb3fa5dee55e..d958a0444ea54fdfb5ee7a935533c9165faaff68 100644 (file)
--- 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)