search

systemli / ansible-role-bind9

Ansible role to install and maintain the Bind9 nameserver on Debian
GNU General Public License v3.0
24 stars 25 forks source link

Initial commit hash? #53

Closed ulvida closed 1 year ago

ulvida commented 2 years ago

Hello, I was trying to prepare a PR, and I came to this problem, that our repos, despite being ours forked from yours seem no longer related.

xshadow commented 2 years ago

The initial commit hash is: 

commit 101b5bdb3028abdc61336d04acf0533ece1f567a
Author: doobry <doobry@systemli.org>
Date:   Wed Apr 18 21:28:54 2018 +0200

    Initial commit

Maybe you have to fork our repo again and add your changes on top of this.

xshadow commented 2 years ago

Could it be related, that we renamed our branches from "master" to "main" and this is somehow not reflected in your git / git configuration?

ulvida commented 2 years ago

The initial commit hash is:

commit 101b5bdb3028abdc61336d04acf0533ece1f567a
Author: doobry <doobry@systemli.org>
Date:   Wed Apr 18 21:28:54 2018 +0200

    Initial commit

Strange. That's the hash we have in our fork for initial commit. In your upstream repo, the present initial commit has another hash. The commit with the hash you mention is still present in the repo, but it's not linked to any branch. Maybe on some way one of you amended this commit?

Maybe you have to fork our repo again and add your changes on top of this.

We, proud french, use to say: Les grands esprits se rencontrent. It's what I did, and proposed you PR #54 (that may take some time to be digested).

ulvida commented 2 years ago

Could it be related, that we renamed our branches from "master" to "main" and this is somehow not reflected in your git / git configuration?

I don't think so. I did already noticed your switch from master to main, and reflected it in my fork with an upstream-main branch, initially identical to your main. I remember I successfully did a git pull upstream main to this branch. And now it refused for unrelated histories. So I suspect something changed from first to second time in main branch or related fork.