Commit change disappeared from repository

From

Renato Botelho <garga@freebsd.org>

Date

Apr 23, 2020, 19:22 UTC

Message-ID

<7b4f2b10-e80d-d4af-6154-6665e37da623@FreeBSD.org>

Hello,

I'm running git 2.26.2 on macOS Catalina.

1. The original commit made in Jan 3 is present in the repo:

❯ git log RELENG_2_4_5 | grep -A5 53e5b36834f1
commit 53e5b36834f1
Author: jim-p <jimp@netgate.com>
Date:   Fri Jan 3 11:50:09 2020 -0500

    Allow sshguard to process via stdin again. Issue #9971

2. Despite the fact commit was present, the change it introduced was not
present on repository contents.

3. This commit changed the file
security/sshguard/files/patch-src_sshguard.in as we can see:

❯ git show 53e5b36834f1 -- security/sshguard/files/patch-src_sshguard.in
commit 53e5b36834f1
Author: jim-p <jimp@netgate.com>
Date:   Fri Jan 3 11:50:09 2020 -0500

    Allow sshguard to process via stdin again. Issue #9971

diff --git a/security/sshguard/files/patch-src_sshguard.in
b/security/sshguard/files/patch-src_sshguard.in
index 6881e162028f..788f0ac2bc47 100644
--- a/security/sshguard/files/patch-src_sshguard.in
+++ b/security/sshguard/files/patch-src_sshguard.in
@@ -1,6 +1,6 @@
 --- src/sshguard.in.orig       2019-05-23 22:25:17 UTC
 +++ src/sshguard.in
-@@ -97,14 +97,8 @@ elif [ -z "$tailcmd" ]; then
+@@ -97,19 +97,12 @@ elif [ -z "$tailcmd" ]; then
      exit 1
  fi

@@ -17,3 +17,9 @@

  # Make sure to kill entire process group (subshell) on exit/interrupts.
  trap "clean_and_exit" INT TERM
+ trap "kill 0" EXIT
+
+ eval $tailcmd | $libexec/sshg-parser | \
+-    $libexec/sshg-blocker $flags | $BACKEND &
+-wait
++    $libexec/sshg-blocker $flags | ($BACKEND ; pkill -PIPE -P $$)

4. Here the odd facts start, git log doesn't show this commit when
filtering the file it changed, which btw, was never moved/renamed.

❯ git log RELENG_2_4_5 -- security/sshguard/files/patch-src_sshguard.in
commit 88d6f4488ab5
Author: delphij <delphij@FreeBSD.org>
Date:   Sun Nov 10 18:34:54 2019 +0000

    Remove redundant pidfile check.

    This fixes an issue that SSHguard won't start after an incompelete
    shutdown.

    PR:             ports/241751
    Approved by:    portmgr (bugfix blanket)
    MFH:            2019Q4

5. After trying to understand what happened, --follow parameter was used
and it shows that commit.  As I mentioned previously, the change it did
on that file was not there, and no other commit reverting it show up.

❯ git log RELENG_2_4_5 --follow -M --
security/sshguard/files/patch-src_sshguard.in
commit 53e5b36834f1
Author: jim-p <jimp@netgate.com>
Date:   Fri Jan 3 11:50:09 2020 -0500

    Allow sshguard to process via stdin again. Issue #9971

commit e4cccfc2c3ab
Author: delphij <delphij@FreeBSD.org>
Date:   Sun Nov 10 18:35:55 2019 +0000

    MFH: r517220

    Remove redundant pidfile check.

    This fixes an issue that SSHguard won't start after an incompelete
    shutdown.

    PR:             ports/241751
    Approved by:    portmgr (bugfix blanket)
    Approved by:    ports-secteam (bugfix blanket)

commit 88d6f4488ab5
Author: delphij <delphij@FreeBSD.org>
Date:   Sun Nov 10 18:34:54 2019 +0000

    Remove redundant pidfile check.

    This fixes an issue that SSHguard won't start after an incompelete
    shutdown.

    PR:             ports/241751
    Approved by:    portmgr (bugfix blanket)
    MFH:            2019Q4

Please let me know if you need me to collect more data.

[1] https://github.com/pfsense/FreeBSD-ports

-- 
Renato Botelho