1296: "Git Commit"

This forum is for the individual discussion thread that goes with each new comic.

Moderators: Moderators General, Prelates, Magistrates

User avatar
Flumble
Yes Man
Posts: 2248
Joined: Sun Aug 05, 2012 9:35 pm UTC

1296: "Git Commit"

Postby Flumble » Wed Nov 27, 2013 5:43 am UTC

Image

Pop-up text: "Merge branch 'asdfasjkfdlas/alkdjf' into sdkjfls-final"


This is so very true. If you're committing at a fast pace (especially when debugging a school project) the comments are often jibberish. That, or no comment at all, if the CVS allows it.


[edit] I was sure I copied the title-text of this comic, but, as ManaUser pointed out, it's the text of the previous comic. Either the site was failing or I was. :oops:
Last edited by Flumble on Wed Nov 27, 2013 1:02 pm UTC, edited 2 times in total.

User avatar
rhomboidal
Posts: 797
Joined: Wed Jun 15, 2011 5:25 pm UTC
Contact:

Re: 1296: "Git Commit"

Postby rhomboidal » Wed Nov 27, 2013 5:47 am UTC

"HERE THERE BE CODE -- AND SEA MONSTERS."

chaoric
Posts: 8
Joined: Wed Nov 27, 2013 6:04 am UTC

Re: 1296: "Git Commit"

Postby chaoric » Wed Nov 27, 2013 6:06 am UTC

"Merge branch 'asdfasjkfdlas/alkdjf' into sdkjfls-final"

Yay another comic with variances depending on... something.

dalcde
Posts: 173
Joined: Fri Apr 06, 2012 5:49 am UTC

Re: 1296: "Git Commit"

Postby dalcde » Wed Nov 27, 2013 6:14 am UTC

My logs:

Code: Select all

773b6a0 Generate random MySQL password on setup
e0fa431 Add dummy files into empty directories
af6828b [Report Generation] Use proper font for status
47381e8 [Settings][Upload Photos] Fix loader not hiding
c1b38fc Fix setup page style
202ebed Fix login page style
8b688f6 [Report] Don't use symbols for status
8ed3b29 [Settings][User Accounts] Remove unused line
a48759b [Settings][User Accounts] Fix change password
a53e14e [View All Records] Implement default sort


Looking good. So far.

User avatar
ManaUser
Posts: 284
Joined: Mon Jun 09, 2008 9:28 pm UTC

Re: 1296: "Git Commit"

Postby ManaUser » Wed Nov 27, 2013 6:18 am UTC

Flumble wrote:Pop-up text: "When the results are published, no one will be sure whether to report on them again."

That's the title text from last comic. (I don't know if it really went out like that initially or not, but in any case) the correct text is "Merge branch 'asdfasjkfdlas/alkdjf' into sdkjfls-final".

coredumperror
Posts: 17
Joined: Fri Mar 20, 2009 4:25 am UTC

Re: 1296: "Git Commit"

Postby coredumperror » Wed Nov 27, 2013 6:43 am UTC

Is anyone else bothered by the fact that these commit messages are in reverse order? I've only ever seen a commit tree like this in gitk, though, so maybe other tools do it like this comic?

User avatar
waveney
Posts: 548
Joined: Mon Dec 03, 2012 8:28 pm UTC
Location: The Far South of England

Re: 1296: "Git Commit"

Postby waveney » Wed Nov 27, 2013 8:48 am UTC

How many Git commits today will be called HAAAAAAAAANDS?

(I have just done one)

o11c
Posts: 5
Joined: Tue Jan 29, 2013 7:28 pm UTC

Re: 1296: "Git Commit"

Postby o11c » Wed Nov 27, 2013 9:05 am UTC

Was anyone else *really* confused at first because the commit list is backwards?

User avatar
Klear
Posts: 1965
Joined: Sun Jun 13, 2010 8:43 am UTC
Location: Prague

Re: 1296: "Git Commit"

Postby Klear » Wed Nov 27, 2013 9:13 am UTC

o11c wrote:Was anyone else *really* confused at first because the commit list is backwards?


I was confused. Let's leave it at that.

User avatar
orthogon
Posts: 3075
Joined: Thu May 17, 2012 7:52 am UTC
Location: The Airy 1830 ellipsoid

Re: 1296: "Git Commit"

Postby orthogon » Wed Nov 27, 2013 11:07 am UTC

o11c wrote:Was anyone else *really* confused at first because the commit list is backwards?

Yeah, I didn't dare say anything because I use TortoiseGit in Windows and feared that the tools for other OSs did it the other way around.

Also, "more code" feels like it should come after "here have code", but is apparently before it if time really goes downwards.
xtifr wrote:... and orthogon merely sounds undecided.

User avatar
PolakoVoador
Posts: 1028
Joined: Fri Jun 10, 2011 11:11 pm UTC
Location: Brazil

Re: 1296: "Git Commit"

Postby PolakoVoador » Wed Nov 27, 2013 11:28 am UTC

orthogon wrote:
o11c wrote:Was anyone else *really* confused at first because the commit list is backwards?

Yeah, I didn't dare say anything because I use TortoiseGit in Windows and feared that the tools for other OSs did it the other way around.

Also, "more code" feels like it should come after "here have code", but is apparently before it if time really goes downwards.


Don't worry, gitk for Linux does the same way you are expecting, with time going upwards.

User avatar
J L
Posts: 242
Joined: Mon Jan 25, 2010 11:03 am UTC
Location: Germany
Contact:

Re: 1296: "Git Commit"

Postby J L » Wed Nov 27, 2013 12:22 pm UTC

I have a very similar system of naming savefiles in PC games or different versions of longish manuscripts I'm working on.

rmsgrey
Posts: 3630
Joined: Wed Nov 16, 2011 6:35 pm UTC

Re: 1296: "Git Commit"

Postby rmsgrey » Wed Nov 27, 2013 12:54 pm UTC

Yeah, if the repository system isn't requiring that each commit be an atomic feature, it shouldn't be requiring you to describe them as though they were.

Sure, you lose some utility in not being able to glance through the list of commits and pick out the one revision where things went wrong to revert to, but if you're doing rapid incremental commits, the code is going to be too unstable at most of them to be worth reverting to anyway...

User avatar
Eternal Density
Posts: 5579
Joined: Thu Oct 02, 2008 12:37 am UTC
Contact:

Re: 1296: "Git Commit"

Postby Eternal Density » Wed Nov 27, 2013 1:07 pm UTC

waveney wrote:How many Git commits today will be called HAAAAAAAAANDS?

(I have just done one)

1. So that's where that came from. I was confused since no had (afaik) told me this comic was up and I kinda forgot because I was busy breaking things.
2. You put it in the extended log so it doesn't show up in gitk :P


3. Here's a complete git commit log as visualised by git:
Spoiler:
Image
redundant:
git.png
"I am not a clever man"
Play the game of Time! castle.chirpingmustard.com Hotdog Vending Supplier But what is this?
In the Marvel vs. DC film-making war, we're all winners.

User avatar
cellocgw
Posts: 2053
Joined: Sat Jun 21, 2008 7:40 pm UTC

Re: 1296: "Git Commit"

Postby cellocgw » Wed Nov 27, 2013 1:22 pm UTC

Guess people need to ... git a grip! :mrgreen:

Or relax, have some breakfast: eggs, sausage, and g[r]it[s] .

My work here is done. Except, like in Soviet Russia, the work commits me.
https://app.box.com/witthoftresume
Former OTTer
Vote cellocgw for President 2020. #ScienceintheWhiteHouse http://cellocgw.wordpress.com
"The Planck length is 3.81779e-33 picas." -- keithl
" Earth weighs almost exactly π milliJupiters" -- what-if #146, note 7

User avatar
Eternal Density
Posts: 5579
Joined: Thu Oct 02, 2008 12:37 am UTC
Contact:

Re: 1296: "Git Commit"

Postby Eternal Density » Wed Nov 27, 2013 1:29 pm UTC

cellocgw wrote:Guess people need to ... git a grip! :mrgreen:

Or relax, have some breakfast: eggs, sausage, and g[r]it[s] .

My work here is done. Except, like in Soviet Russia, the work commits me.

Don't make me call in a scrumptious donut strike.
Play the game of Time! castle.chirpingmustard.com Hotdog Vending Supplier But what is this?
In the Marvel vs. DC film-making war, we're all winners.

k.j.
Posts: 3
Joined: Fri Sep 09, 2011 12:47 pm UTC

Re: 1296: "Git Commit"

Postby k.j. » Wed Nov 27, 2013 1:52 pm UTC

I am well aware that I am completely spoiling the joke here, but if someone opened a pull request with those commits in it, I would close it without reading.

Small commits are great while developing, but once it comes time to share with the world, they should be rebased on top of HEAD and squashed to a single commit per feature.

User avatar
PinkShinyRose
Posts: 834
Joined: Mon Nov 05, 2012 6:54 pm UTC
Location: the Netherlands

Re: 1296: "Git Commit"

Postby PinkShinyRose » Wed Nov 27, 2013 2:27 pm UTC

J L wrote:I have a very similar system of naming savefiles in PC games or different versions of longish manuscripts I'm working on.

No, I don't think this is a programming specific problem. It's really anywhere where people have a social obligation to write/type something in a field but don't feel like doing so (or don't have anything sensible to fill in). Although the 'adfasklfnakl' generally means a lack of social obligation combined with a field required for acceptance of the form. Somehow this doesn't seem to happen as much as you would expect on wikipedia...

alexdresko
Posts: 1
Joined: Wed Nov 27, 2013 1:42 pm UTC

Re: 1296: "Git Commit"

Postby alexdresko » Wed Nov 27, 2013 2:34 pm UTC

No one writes this much code in a day.

User avatar
Red Hal
Magically Delicious
Posts: 1445
Joined: Wed Nov 28, 2007 2:42 pm UTC

Re: 1296: "Git Commit"

Postby Red Hal » Wed Nov 27, 2013 2:34 pm UTC

Eternal Density wrote:
3. Here's a complete git commit log as visualised by git:
Which zone is bucket boosts in, and how much is a return ticket on a Sunday?
Lost Greatest Silent Baby X Y Z. "There is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain..."

User avatar
waveney
Posts: 548
Joined: Mon Dec 03, 2012 8:28 pm UTC
Location: The Far South of England

Re: 1296: "Git Commit"

Postby waveney » Wed Nov 27, 2013 2:53 pm UTC

Red Hal wrote:
Eternal Density wrote:
3. Here's a complete git commit log as visualised by git:
Which zone is bucket boosts in, and how much is a return ticket on a Sunday?

Zone 3.14159263, £179.43 (only 55p the rest of the week)

User avatar
Wnderer
Posts: 640
Joined: Wed Feb 03, 2010 9:10 pm UTC

Re: 1296: "Git Commit"

Postby Wnderer » Wed Nov 27, 2013 2:58 pm UTC

waveney wrote:
Red Hal wrote:
Eternal Density wrote:
3. Here's a complete git commit log as visualised by git:
Which zone is bucket boosts in, and how much is a return ticket on a Sunday?

Zone 3.14159263, £179.43 (only 55p the rest of the week)


No it's Zone 6.28318530, £71.79 (only 58p the rest of the week)

User avatar
PolakoVoador
Posts: 1028
Joined: Fri Jun 10, 2011 11:11 pm UTC
Location: Brazil

Re: 1296: "Git Commit"

Postby PolakoVoador » Wed Nov 27, 2013 3:00 pm UTC

Heh. I've finally convinced people at the company I work to use Git, and the "test-weeks" just began. I might print this comic and hang it somewhere :mrgreen:

EDIT: The image in OP is linking to the wrong comic.

User avatar
waveney
Posts: 548
Joined: Mon Dec 03, 2012 8:28 pm UTC
Location: The Far South of England

Re: 1296: "Git Commit"

Postby waveney » Wed Nov 27, 2013 3:22 pm UTC

Wnderer wrote:
waveney wrote:
Red Hal wrote:
Eternal Density wrote:
3. Here's a complete git commit log as visualised by git:
Which zone is bucket boosts in, and how much is a return ticket on a Sunday?

Zone 3.14159263, £179.43 (only 55p the rest of the week)


No it's Zone 6.28318530, £71.79 (only 58p the rest of the week)

Only if you start from Mornington Cresent.

Kit.
Posts: 1117
Joined: Thu Jun 16, 2011 5:14 pm UTC

Re: 1296: "Git Commit"

Postby Kit. » Wed Nov 27, 2013 3:26 pm UTC

PinkShinyRose wrote:No, I don't think this is a programming specific problem. It's really anywhere where people have a social obligation to write/type something in a field but don't feel like doing so (or don't have anything sensible to fill in).

Well, part of this problem has a programming specific solution: if you have nothing to say about the changes you have made so far, don't commit them.

dalcde
Posts: 173
Joined: Fri Apr 06, 2012 5:49 am UTC

Re: 1296: "Git Commit"

Postby dalcde » Wed Nov 27, 2013 3:27 pm UTC

Kit. wrote:
PinkShinyRose wrote:No, I don't think this is a programming specific problem. It's really anywhere where people have a social obligation to write/type something in a field but don't feel like doing so (or don't have anything sensible to fill in).

Well, part of this problem has a programming specific solution: if you have nothing to say about the changes you have made so far, don't commit them.


I call them WIP (mostly when I want to transfer the changes from one machine to another)

User avatar
Archgeek
Posts: 262
Joined: Wed May 02, 2007 6:00 am UTC
Location: Central US
Contact:

Re: 1296: "Git Commit"

Postby Archgeek » Wed Nov 27, 2013 4:30 pm UTC

Eternal Density wrote:3. Here's a complete git commit log as visualised by git:

Gah! I get the leopard gag, but what's with all the mustard? Are hotdogs being programmed?
"That big tube down the side was officially called a "systems tunnel", which is aerospace contractor speak for "big tube down the side."

User avatar
waveney
Posts: 548
Joined: Mon Dec 03, 2012 8:28 pm UTC
Location: The Far South of England

Re: 1296: "Git Commit"

Postby waveney » Wed Nov 27, 2013 4:39 pm UTC

Archgeek wrote:
Eternal Density wrote:3. Here's a complete git commit log as visualised by git:

Gah! I get the leopard gag, but what's with all the mustard? Are hotdogs being programmed?

Yes the hotdog is the program.

The Time glossary might help...

User avatar
Wnderer
Posts: 640
Joined: Wed Feb 03, 2010 9:10 pm UTC

Re: 1296: "Git Commit"

Postby Wnderer » Wed Nov 27, 2013 5:10 pm UTC

We should call it commit vomit, because it is hard to say.

EDIT: Comet Vomit? Commit Vumm it?

User avatar
BlitzGirl
Posts: 9098
Joined: Mon Sep 20, 2010 11:48 am UTC
Location: Out of the basement for Yip 6! Schizoblitz: 115/2672 NP
Contact:

Re: 1296: "Git Commit"

Postby BlitzGirl » Wed Nov 27, 2013 6:42 pm UTC

Eternal Density wrote:
cellocgw wrote:Guess people need to ... git a grip! :mrgreen:

Or relax, have some breakfast: eggs, sausage, and g[r]it[s] .

My work here is done. Except, like in Soviet Russia, the work commits me.

Don't make me call in a scrumptious donut strike.

Did somebody call for a scrumptious donut in here? *eyes cellocgw suspiciously*

In case anyone's curious, the log Eternal Density posted is for the castle.chirpingmustard game in his sig, which is very RELATED to #1190 (hence the OTTer lingo).
Knight Temporal of the One True Comic
BlitzGirl the Pink, Mopey Molpy Mome
Spoiler:
Image
Image
Image<Profile
~.Image~.FAQ->Image

weksauce
Posts: 3
Joined: Sun Dec 30, 2007 5:57 am UTC

Re: 1296: "Git Commit"

Postby weksauce » Wed Nov 27, 2013 6:48 pm UTC

Randall, I am disappoint.

The merge should have been more like: aoeidu/htaoeo

#impostercoder

monovitae
Posts: 1
Joined: Wed Nov 27, 2013 6:05 pm UTC

Re: 1296: "Git Commit"

Postby monovitae » Wed Nov 27, 2013 7:28 pm UTC

My solution has been to alias wtc as follows in my .bashrc_custom

alias wtc='echo "$(curl -s whatthecommit dot com/index.txt)"'

then its simply a matter of git commit -m "`wtc`"

Its made my commits so much more interesting.

bonus points:

alias gc = 'git commit -m "`wtc`"

1. make all sorts of changes that will ultimately break the project
2. gc
3. ????
4 Profit!

User avatar
Will
There are about a million things I can do from behind
Posts: 2256
Joined: Mon Sep 10, 2007 11:12 pm UTC
Location: St. Heraldwulf's Stone
Contact:

Re: 1296: "Git Commit"

Postby Will » Wed Nov 27, 2013 7:50 pm UTC

Here is a completely legit selection from my git log:

Code: Select all

* 6b23a6c - (7 months ago) bugfixes - Will ******
* 7a2eaf3 - (7 months ago) more bugfixes - Will ******
* cc8ecdd - (7 months ago) bugfixes - Will ******
*   1b4d5d0 - (7 months ago) Merge branch 'newhq' - Will ******
|\ 
| * dc8b764 - (7 months ago) bugfixes - Will ******
Meaux_Pas: Is it fucking Taint Sunday or something?
liza: Screw y'all, I'm going to the moon

rmsgrey
Posts: 3630
Joined: Wed Nov 16, 2011 6:35 pm UTC

Re: 1296: "Git Commit"

Postby rmsgrey » Wed Nov 27, 2013 8:29 pm UTC

Kit. wrote:
PinkShinyRose wrote:No, I don't think this is a programming specific problem. It's really anywhere where people have a social obligation to write/type something in a field but don't feel like doing so (or don't have anything sensible to fill in).

Well, part of this problem has a programming specific solution: if you have nothing to say about the changes you have made so far, don't commit them.


There is utility in committing your work every couple of hours even when you're just plowing through something - it means that when your machine crashes, you only lose a couple of hours' work (plus the time spent rebuilding state) rather than the past week's.

At one point I was adding a large component to a project for a future version, while also performing bugfixes as high priority on the current version - that generated a large number of commits on the future branch that were just snapshots of the current state so I could come back to it after fixing the live branch. Very few of those commits were actually meaningful for the future branch except insofar as they let me continue working on it.

Some of the commit comments were reminders to myself of what to do next; most were just semantic nulls.

devent
Posts: 2
Joined: Wed Dec 14, 2011 1:07 pm UTC

Re: 1296: "Git Commit"

Postby devent » Wed Nov 27, 2013 9:11 pm UTC

Hello,
I'm a developer and I'm using git for my work. If you are, too, some suggestions:
In git you can amend an older commit to change the commit message or to add new files. This way you don't have commits less then 1 hour apart like "Some code" "More code" "Even more code", but you can just amend one older commit to include those changes. Just a suggestion, but I get the point of the comic. :D

git commit -amend

User avatar
Klear
Posts: 1965
Joined: Sun Jun 13, 2010 8:43 am UTC
Location: Prague

Re: 1296: "Git Commit"

Postby Klear » Wed Nov 27, 2013 9:16 pm UTC

I just wanted to say that since I have no idea what "git commit" means, I'm mentally substituting "god dammit".

User avatar
PinkShinyRose
Posts: 834
Joined: Mon Nov 05, 2012 6:54 pm UTC
Location: the Netherlands

Re: 1296: "Git Commit"

Postby PinkShinyRose » Wed Nov 27, 2013 10:10 pm UTC

Klear wrote:I just wanted to say that since I have no idea what "git commit" means, I'm mentally substituting "god dammit".

From what I understand: git is a co-operative editing system for programmers and committing simply means uploading your changes.

dalcde
Posts: 173
Joined: Fri Apr 06, 2012 5:49 am UTC

Re: 1296: "Git Commit"

Postby dalcde » Wed Nov 27, 2013 10:14 pm UTC

PinkShinyRose wrote:
Klear wrote:I just wanted to say that since I have no idea what "git commit" means, I'm mentally substituting "god dammit".

From what I understand: git is a co-operative editing system for programmers and committing simply means uploading your changes.


Git commit is saving your changes. Git push is uploading your changes.

User avatar
Klear
Posts: 1965
Joined: Sun Jun 13, 2010 8:43 am UTC
Location: Prague

Re: 1296: "Git Commit"

Postby Klear » Wed Nov 27, 2013 10:26 pm UTC

dalcde wrote:
PinkShinyRose wrote:
Klear wrote:I just wanted to say that since I have no idea what "git commit" means, I'm mentally substituting "god dammit".

From what I understand: git is a co-operative editing system for programmers and committing simply means uploading your changes.


Git commit is saving your changes. Git push is uploading your changes.


Thanks, but my way of reading it is better.

rmsgrey
Posts: 3630
Joined: Wed Nov 16, 2011 6:35 pm UTC

Re: 1296: "Git Commit"

Postby rmsgrey » Wed Nov 27, 2013 11:05 pm UTC

Git is a distributed versioning system. The non-distributed model of version systems has a central server which acts like a librarian and keeps hold of all the files. If you want to work on a file, you need to borrow it from the library ("check out" the file) and then, once you're done doing stuff with it, give it back ("check in" the file). The advantage is that there's one central repository that either holds the definitive version of any given bit of code, or can tell you were to look for it; the disadvantages are that you can only work on a bit of code if no-one else is already working on code in the same file, and that you're at the mercy of other people forgetting to check in the files they're finished with.

Distributed systems, like Git, don't have a privileged central repository - instead, when you grab a copy of some or all of the files from someone else on the project, both versions are equally valid, and remain that way - your version "branches off" the other version, and can be developed independently until someone with a copy of both branches decides to merge them (even then, they're only merged in their personal version of the repository until they "push" their new version to other people, or other people "pull" it from them). The clever bit is the merging process - when you tell Git to merge another branch into your current one, it goes through comparing each file with its other version, and with the nearest common ancestor, and where only one parent version has changed from the ancestral version at a given line, takes that change and includes it in the child version. It's only when both versions have different changes to the same bit of code that it appeals for human intervention - depending on how recent the common ancestor is, and how major the changes on each branch are, it's possible to merge smoothly without any human intervention, or, if two people have been working on the same stretch of code with different coding conventions, you can end up having to rewrite that entire section by hand (or choose one version to override the other either on a case by case basis or globally). Most of the time, merging is an easy process.

So, with Git, you're actively encouraged to fork the code, to spin off an experimental branch to play with something, or to work on the same files as someone else, knowing that you can merge anything you want to keep back into (your copy of) the main branch - or allow the person in charge of the project's official codebase to pull your branch and merge it with the prime branch.


Return to “Individual XKCD Comic Threads”

Who is online

Users browsing this forum: Google [Bot] and 106 guests