search

keithmorris / node-dotenv-extended

A module for loading .env files and optionally loading defaults and a schema for validating all values are present.
MIT License
111 stars 24 forks source link

Git History + Package Version Conflict #31

Closed niftylettuce closed 4 years ago

niftylettuce commented 4 years ago

Hey! I noticed you force pushed and the git log is different:

commit 5eb5058f12534485f23c203c4b6cc92a84706f0a (HEAD -> master, tag: v2.7.0, origin/master)
Author: niftylettuce <niftylettuce@gmail.com>
Date:   Sun Dec 15 22:33:32 2019 -0600

    2.7.0

commit 571948c8e262ffec98a1dbed3488c29fd5fc711b
Author: niftylettuce <niftylettuce@gmail.com>
Date:   Sun Dec 15 22:32:52 2019 -0600

    fix: returned configData object should conditionally include process.env overrides

commit 30bfc9189e2471fbdbe644638c0de9b8097f0b1c (tag: v2.6.0)
Author: niftylettuce <niftylettuce@gmail.com>
Date:   Fri Dec 13 15:12:42 2019 -0600

    2.6.0

commit eca52b4a9bc0592626409a8e06766da89eb5b489 (origin/develop, origin/HEAD, develop)
Author: niftylettuce <niftylettuce@gmail.com>
Date:   Fri Dec 13 15:00:52 2019 -0600

    fix: check for extra keys needs to be specific to schema (closes #28)

commit c35bc2b81d1a2169f5fda91330e49300eb7fbef1
Merge: 2c4b822 dd9909b
Author: Keith Morris <standupbass@gmail.com>
Date:   Sun Oct 27 12:07:59 2019 -0400

    Merge tag '2.5.0' into develop

    Remove useless dependencies and modernize build

Can you give me insight as to why? I've fixed two core bugs with the package (backwards compatible) and one of them is now missing.

Also I noticed that there is a duplicate commit with two different hashes:

https://github.com/keithmorris/node-dotenv-extended/commit/eca52b4a9bc0592626409a8e06766da89eb5b489

https://github.com/keithmorris/node-dotenv-extended/commit/60594f6b5716af8dfa68335dfda09ad421387406

I can git push --force again if you'd like me to fix the history.

Just so you're aware I used np to publish.

niftylettuce commented 4 years ago

I've fixed this