Merge branch 'dl/complete-cherry-pick-revert-skip'

diff --git a/gpg-interface.c b/gpg-interface.c
index bea1aa2b5a7c4c22e435f2d45da4ddb6ef62bc9c..d60115ca404edfedc492c55e5bc0f22fe0eaa5a2 100644 (file)
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -116,6 +116,9 @@ static void parse_gpg_output(struct signature_check *sigc)
        for (line = buf; *line; line = strchrnul(line+1, '\n')) {
                while (*line == '\n')
                        line++;
+               if (!*line)
+                       break;
+
                /* Skip lines that don't start with GNUPG status */
                if (!skip_prefix(line, "[GNUPG:] ", &line))
                        continue;
@@ -124,7 +127,7 @@ static void parse_gpg_output(struct signature_check *sigc)
                for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_status); i++) {
                        if (skip_prefix(line, sigcheck_gpg_status[i].check, &line)) {
                                if (sigcheck_gpg_status[i].flags & GPG_STATUS_EXCLUSIVE) {
-                                       if (++seen_exclusive_status > 1)
+                                       if (seen_exclusive_status++)
                                                goto found_duplicate_status;
                                }