Mark this shit NSFW. I could have viewed it at work.

Cause of death: 15 minute long pre-push hook

Redeven
link
fedilink
171Y

Just

git add . && git commit -m "sorry theres a fire" && git push -u origin feature/fire

And run out. It will eventually finish pushing. Or not.

git add .; git commit -nm fire --no-gpgsign; git push -n origin fire/${USER}

no changes added to commit (use “git add” and/or “git commit -a”)

It should (at least) be:

git commit -a -m "🚨🔥🚨"
git push --force

Better, create a new branch and push it to origin(?).

Relevant The IT Crowd

Better have not created any new files tho - git commit -a doesn’t catch those without an add first.

ZephyrXero
link
fedilink
English
1
edit-2
1Y

So we need git add . && git commit -a here really

In which case the -a isn’t needed.

Commit message: It’s lit🔥🔥🔥

PrettyFlyForAFatGuy
link
fedilink
47
edit-2
1Y

i read a reddit post years ago where a someone wrote a script that iterates through all the projects in their dev folder, for each project creating a new branch, committing and pushing.

they then aliased it to “fire” or “panic” or something like that.

not a bad idea really

As in one they’d manually run if there was a fire?

icedterminal
link
fedilink
English
61Y

Exactly. The alias just points to the script which is executed.

Ohh I see so you just run git fire?

if its aliased you should be able to just run “fire” and it does the rest

Oh bash alias right

Fushuan [he/him]
link
fedilink
English
361Y

Slight correction. In case of fire:

Git checkout -b firemyusername Git commit -am=“fire” Git push.

We don’t want to have conflicts with code versions when going in on a rush, better to create a new branch. We can merge all the conflicts afterwards.

Oh man I hadn’t seen a git checkout -b in years haha since they introduced switch and restore, never looked back

Fushuan [he/him]
link
fedilink
English
21Y

I’ll admit I just press the buttons in my favourite IDE and had to look up the commands to remind myself, but yeah.

Isn’t that what git stash is for though?

Drew
link
fedilink
41Y

Can’t push a stash

@PoolloverNathan@programming.dev
link
fedilink
English
1
edit-2
1Y

git push origin refs/stash@{$n}:stash/$USER/$n iirc

Can’t you? Could’ve sworn you could

I’ve done it with TFS source control at least, thought it would be possible with git

@marx2k@lemmy.world
link
fedilink
1
edit-2
1Y

Gonna need some semicolons or double ampersand in there

Fushuan [he/him]
link
fedilink
English
21Y

Nah, what I need is doble new lines of code blocks since this is markdown and it fucked the display.

malijaffri
link
fedilink
21Y

Here you go:

git checkout -b firemyusername
git commit -am="fire"
git push
Fushuan [he/him]
link
fedilink
English
11Y

I know how to do it, I was just lazy lmao.

This is a lawsuit waiting to happen. Anyway any of you ever heard of ACID? Why aren’t our undo buffers durable and integrated with version control? Squash and forget the individual keystrokes as soon as an actual commit is made.

And if your git repo is self-hosted on-prem, you’d better be helping pack it and carry it out.

Fedora
link
fedilink
211Y

What about git add?

“I followed the rules, Boss. Not my fault the rules are stupid 🤷‍♂️”

You could change it to git commit . to add and commit everything. But just in case you weren’t up to date, you should probably do

git commit .

git pull -s ours

git push

For maximum chaos.

deleted by creator

*git out

*git -tf out

If the flames are nearby I would be so reckless and execute git push --force.
I don’t want to die for a merge conflict.
But maybe then the team will burn me later.

Just push to a new branch

I’ve got something similar on my office door that reads

In case of fire<br> git commit -a<br> git push<br> git -tf out

Me burning to death fixing pylint warnings before I can commit my code.

Melting because someone didn’t configure the right profile and now isort and black are fighting over imports.

Shizu
link
fedilink
541Y

Merge conflict

Should’ve pulled first before starting your work.

Sometimes my work takes a while and other people push in the meantime. Guess I’m dying the fire.

Then you pull before committing.

Boom, merge conflict. The only thing left to me is force push and delete everyone’s changes.

Eh, it’s probably fine. Those chumps don’t do anything useful.

On a push? What are you merging there?

Fushuan [he/him]
link
fedilink
English
41Y

Ofc, you might be working directly on develop/master/shared branch, I know people that work in those environments (ew)

Right, on shared branch you might need to pull first if you’re out of date (and you would be if you’re all leaving the office at the same time), and that could cause a merge conflict.

It’s like I always said, bad branching strategies are a fire safety issue.

Here at Company Inc, we continue to send our thoughts and prayers to the 38 interns who perished in the office fire of ‘07. Sixteen years later, we still mourn the loss caused by this unpredictable, unpreventable, and unlitigatable accident. We hope that, in time, the grieving families of those interns are eventually able to move on with both their hearts and their loved ones’ funeral expense debts.

Create a post

Post funny things about programming here! (Or just rant about your favourite programming language.)

Rules:

  • Posts must be relevant to programming, programmers, or computer science.
  • No NSFW content.
  • Jokes must be in good taste. No hate speech, bigotry, etc.
  • 1 user online
  • 77 users / day
  • 211 users / week
  • 413 users / month
  • 2.92K users / 6 months
  • 1 subscriber
  • 1.53K Posts
  • 33.8K Comments
  • Modlog