New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Git history is full of shit #1413

Closed
JoshDreamland opened this Issue Oct 16, 2018 · 5 comments

Comments

Projects
None yet
3 participants
@JoshDreamland
Member

JoshDreamland commented Oct 16, 2018

I was going to leave it alone until we committed 5MB of binaries to it. Now master needs to be replaced.

To-do points:

  • Erase those DLLs from history
  • Squash the hundreds of "update travis.ci" commits from Sam's other PR into one commit.
  • Audit for any other broken commits.
@RobertBColton

This comment has been minimized.

Member

RobertBColton commented Oct 16, 2018

Sorry, he told me you were ok with the dll, I believed that.

@JoshDreamland

This comment has been minimized.

Member

JoshDreamland commented Oct 16, 2018

I am okay with the dependency on a DLL, yes, but I told him he'd need to find somewhere to host it.
Anyway, don't worry about it. I've missed binaries in the diff preview as well, because GitHub doesn't put much emphasis on them. It's just like, "also, a binary file was checked in."

@time-killer-games

This comment has been minimized.

Contributor

time-killer-games commented Oct 17, 2018

@JoshDreamland I asked you if we could host it on Github and you said "ok". At any rate I misunderstood what you were ok with. You meant in my own repository, which wasn't very clear to me.

@JoshDreamland

This comment has been minimized.

Member

JoshDreamland commented Nov 12, 2018

This has been resolved.

Rebase work log: https://pastebin.com/TqAT3nq7

ENIGMA master has been changed from ab5f27d950036a.

Diff:

josh@dreamland:~/Projects/ENIGMA$ git diff ab5f27d4f0cee229a735ff1070b797aca6bf1c6e 950036ab76c366d5ab809011a94bda68d86f9f9d
diff --git a/Compilers/Linux/gcc.ey b/Compilers/Linux/gcc.ey
index 3f321df71..4df34fc47 100644
--- a/Compilers/Linux/gcc.ey
+++ b/Compilers/Linux/gcc.ey
@@ -14,7 +14,7 @@ Make-Vars:
   cppflags:
   cxxflags: -std=c++11
   cflags:
-  ldflags: -no-pie
+  ldflags:
   links:
 
 Parser-Vars:
diff --git a/ENIGMAsystem/SHELL/Widget_Systems/DlgMod/x64/DialogModule.dll b/ENIGMAsystem/SHELL/Widget_Systems/DlgMod/x64/DialogModule.dll
deleted file mode 100644
index 7def7f440..000000000
Binary files a/ENIGMAsystem/SHELL/Widget_Systems/DlgMod/x64/DialogModule.dll and /dev/null differ
diff --git a/ENIGMAsystem/SHELL/Widget_Systems/DlgMod/x86/DialogModule.dll b/ENIGMAsystem/SHELL/Widget_Systems/DlgMod/x86/DialogModule.dll
deleted file mode 100644
index f5f55249b..000000000
Binary files a/ENIGMAsystem/SHELL/Widget_Systems/DlgMod/x86/DialogModule.dll and /dev/null differ
@RobertBColton

This comment has been minimized.

Member

RobertBColton commented Nov 12, 2018

We maybe want to post an announcement about this? I am not sure, but if people go to git pull, I think they'll have some issues.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment