IRCloggy #git 2016-02-20

Logs Search ←Prev date Next date→ Channels Documentation

Provider of IRC logs since 2005.
WARNING: As Freenode became unjoinable and lost all warnings in topics, we cannot log channels on Freenode anymore.

2016-02-20

→ leprechau joined00:00
← ytl left00:00
← flughafen_ left00:00
→ drodger joined00:02
→ shaggycat joined00:03
← diegoaguilar left00:04
→ madewokherd joined00:07
← clemf left00:08
sgen Commits should be as small as possible right? Is that as small as possible while still representing a working state or just as small as possible? I have to edit ~5 files to make this change and committing it all is making me feel dirty00:09
← kpease left00:09
← nettoweb left00:09
← leeN left00:09
kadoban commits should be the minimum amount of coherent code changes/additions that you can give a good description to.00:09
bremner commits should be as small as possible, but no smaller. - A. Einstein00:10
→ ellistaa joined00:12
← deepy left00:12
→ deepy joined00:12
ellistaa github question. how can i get a specific branch from a repo?00:13
→ cagedwisdom joined00:13
ellistaa i tried git fetch origin name-of-branch00:13
sgen Even if it breaks the build?00:13
← ellistaa left00:14
kadoban ellistaa: 'git fetch' will make the remote-tracking branch exist locally for you (origin/name-of-branch), which you can see with 'git branch -a'. If you want a local branch to mess with that'll track that, do 'git checkout name-of-branch' and it'l be created for you and you'll switch to it.00:14
Waited a whole <60 seconds for an answer … brilliant.00:15
← Douhan left00:15
← strayPuppy left00:15
→ diegoaguilar joined00:18
← cagedwisdom left00:18
← nwkj86 left00:18
→ jetpack__ joined00:18
→ mwhooker joined00:19
← nonconvergent left00:19
← durham_ left00:19
→ grillo joined00:23
→ spinning1 joined00:24
← guest left00:25
→ vkngpmhc joined00:27
→ bhowe_ joined00:28
← bhowe left00:28
← spinning1 left00:28
← ril left00:28
← fission6 left00:28
→ ril joined00:29
← dantix left00:30
→ Levitator joined00:30
→ cagedwisdom joined00:30
→ vkngpmhc_ joined00:31
← vkngpmhc_ left00:31
← vkngpmhc left00:32
← shaggycat left00:32
← cdg left00:34
← _noblegas left00:36
→ blur3d joined00:36
← blur3d left00:36
← diegoaguilar left00:37
← mattfoo left00:40
← vok` left00:41
→ strayPuppy joined00:41
→ jam__ joined00:41
→ diegoaguilar joined00:42
→ rory joined00:42
← muld left00:42
← kilo_bravo left00:43
← renlo left00:44
→ GuKKDevel_ joined00:44
← samw left00:45
→ samw joined00:45
← hosttor left00:45
← samw left00:45
→ mattfoo joined00:45
← jam__ left00:46
← mwhooker left00:48
→ renlo joined00:48
← GuKKDevel left00:48
→ spb joined00:49
→ daito joined00:50
→ s9 joined00:50
← Balliad left00:51
← s9 left00:52
→ s9 joined00:52
← renlo left00:52
← LekeFly left00:53
← hexagoxel left00:53
→ hexagoxel joined00:54
← daito left00:54
← fscala left00:56
→ huntleja joined00:57
→ rkazak joined00:58
→ fscala joined00:58
← fstd left00:59
→ fstd joined00:59
← Behi left01:00
← mleu left01:05
← s9 left01:07
→ s9 joined01:07
→ blur3d joined01:09
← grillo left01:15
← imachuchu left01:16
→ bb010g joined01:17
gitinfo set mode: +v01:17
→ samw joined01:17
→ Sucks joined01:17
→ spinning1 joined01:18
→ cagmz joined01:19
→ realtime joined01:20
← s9 left01:21
bbq → blurpeace01:22
← nicolas_leonidas left01:22
← spinning1 left01:22
← dopesong left01:24
← cagmz left01:28
→ endiruna1 joined01:28
→ cagmz joined01:28
→ clemf joined01:29
← mingwandroid left01:30
← clemf left01:30
→ shaggycat joined01:31
← huntleja left01:31
← endiruna left01:31
← Noldorin left01:32
← ToBeCloud left01:34
← bhowe_ left01:35
→ kahn_dumb joined01:35
→ snonez joined01:35
← kahn_dumb left01:35
→ jkahn joined01:35
← akushner left01:36
← Levitator left01:37
← endiruna1 left01:37
← bitkiller left01:37
→ tomog999_ joined01:38
→ Levitator joined01:38
→ endiruna1 joined01:38
← arooni left01:38
→ lindenle joined01:38
→ jon3ss joined01:39
← snonez left01:40
osse maybe they had to go to a funeral01:40
← tomog999 left01:40
← CheckDavid left01:41
→ Schwarzbaer_ joined01:42
→ fbwnd joined01:42
← diegoviola left01:42
← lindenle left01:43
→ mingwandroid joined01:44
← endiruna1 left01:44
← fees left01:45
i7c Funerals are urgent?01:45
← Schwarzbaer left01:46
← Sasazuka left01:46
← shaggycat left01:47
← jkahn left01:52
← Sucks left01:52
→ jkahn joined01:53
← thiago left01:53
→ pwnz0r joined01:55
← pwnz0r left01:56
→ pwnz0r joined01:57
← jkahn left01:57
→ kahn_dumb joined01:57
← ril left01:59
← DolphinDream_ left01:59
← kahn_dumb left01:59
← Ntemis left01:59
← epyx left02:00
→ ril joined02:00
← strozyka_ left02:00
← dreiss left02:01
→ strozyka joined02:01
← cagmz left02:01
→ Tortoise1 joined02:01
→ codepython777 joined02:02
codepython777 Inside cygwin/babun, how do i set git -m to invoke sublime text?02:03
← MattMaker left02:03
← Tortoise left02:03
→ s9 joined02:05
→ Tortoise joined02:05
← ril left02:05
← bollullera left02:05
← Tortoise1 left02:05
← strozyka left02:08
→ Vampire0_ joined02:08
← Vampire0 left02:11
→ ytl joined02:13
← pks left02:13
→ pks joined02:15
← EvilPenguin left02:16
→ dermoth joined02:19
← fbwnd left02:19
→ fission6 joined02:19
→ huntleja joined02:20
→ donmichelangelo joined02:21
→ sargas joined02:21
← mkopriva left02:24
← jagob left02:24
→ tyll joined02:25
← samw left02:25
← michelangelo left02:25
← raijin left02:27
← tyll_ left02:27
← sargas left02:31
← rkazak left02:34
← bronson left02:35
milki wonders what babun and git -m are02:37
codepython777 milki: Just 'git commit -m ... ' on windows02:37
I want default editor to be sublime text02:38
milki -m doesnt launch an editor at all02:38
it means take the value as the commit message02:38
→ raijin joined02:39
codepython777 milki: I meant when "-m" is not used i want subl to execute02:39
milki ah02:39
codepython777: you can set GIT_EDITOR02:39
codepython777: or EDITOR02:39
codepython777 milki: I did - but it complains of path not recognised and aborts02:39
→ fbwnd joined02:39
milki codepython777: see man git commit02:39
gitinfo codepython777: the git-commit manpage is available at http://jk.gs/git-commit.html02:39
→ dopesong joined02:39
→ toothe joined02:40
milki codepython777: sounds like you got the wrong path then02:40
codepython777 milki: i think on windows cygwin and windows paths are clashing02:40
toothe i have a git repo that I want to convert to a bare repo.02:41
HOw do I do that?02:41
→ jam__ joined02:42
← nfk left02:42
← jetpack__ left02:44
← dopesong left02:44
← jam__ left02:47
← huntleja left02:47
→ rkazak joined02:48
← gfixler2 left02:48
→ blahdodo joined02:48
→ daito joined02:50
milki toothe: you can clone it as bare02:50
→ sargas joined02:51
→ jon-mac joined02:51
← jon3ss left02:51
→ tpollard joined02:52
→ JackFruh joined02:52
toothe clone it as abare...02:52
← frem left02:52
← s9 left02:53
← Levitator left02:53
← daito left02:54
toothe ahh, figured it out.02:55
← iota_pi left02:55
→ nydel07 joined02:55
← fenugrec_ left02:58
← mingwandroid left03:00
→ daito joined03:02
→ shaggycat joined03:02
→ hizzard joined03:05
→ spinning1 joined03:06
← jeffmjack left03:07
← daito left03:08
← HelloAtMega left03:09
← spinning1 left03:11
→ dstarh joined03:12
→ clemf joined03:12
→ Sucks joined03:13
→ fahadash joined03:14
← clemf left03:14
→ jagob joined03:15
← fission6 left03:15
← rkazak left03:16
← Sucks left03:16
→ Sucks joined03:17
← Sucks left03:17
→ Sucks joined03:17
← Sucks left03:17
→ Sucks joined03:18
← Dyonisos left03:18
← bket2 left03:19
← Sucks left03:20
→ Sucks joined03:20
← hizzard left03:22
→ gambl0re joined03:22
← mezod left03:23
← tang^ left03:23
→ clemf joined03:24
← clemf left03:27
→ dtrinh joined03:27
→ dreiss joined03:28
← fbwnd left03:28
← mmlb_ left03:29
→ SimonNa joined03:29
→ amdi_ joined03:29
→ watabou joined03:29
← watabou left03:30
← diegoaguilar left03:31
← shaggycat left03:35
← gambl0re left03:36
→ MattMaker joined03:37
← Sucks left03:38
← chachasmooth left03:38
→ Sucks joined03:39
→ chachasmooth joined03:40
→ variable joined03:41
toothe okay, i screwed thsi up.03:42
i fiured it out last week, but forgot now03:42
I can't seem to push....everything up to date.03:42
← ericvw left03:42
toothe I forgot what I did last time...03:42
← diogenese left03:44
→ diogenese joined03:45
→ moobee joined03:45
gitinfo set mode: +v03:45
→ kohei__ joined03:45
→ fbwnd joined03:46
← MattMaker left03:46
← yqt left03:47
→ MattMaker joined03:48
← felixn left03:51
← pwnz0r left03:53
→ modocache joined03:53
→ felixn joined03:54
toothe hm...03:55
→ MindfulMonk joined03:56
← Sucks left03:56
→ Goplat joined03:57
→ Sucks joined03:57
← Sucks left03:57
← irc-5225225 left03:57
→ watabou joined03:58
→ gfixler joined03:58
→ Sucks joined03:58
← m0viefreak left03:59
← MindfulM_ left03:59
→ cabargas joined03:59
→ Jusle joined04:03
← dsdeiz left04:04
toothe yeah, i need help.04:05
I cant do a it push04:05
do a git push04:05
everythign up to date....but its to a brand new thing.04:05
brand new bare repo.04:05
→ fedexo joined04:07
toothe i screwed thsi up bad...04:08
← postsneakernet left04:08
← flavi0 left04:08
← kohei__ left04:10
→ Kyle_j joined04:10
→ irc-5225225 joined04:10
→ Levitator joined04:10
prooftechnique Please explain what you've done so far04:12
Did you set a remote with git remote?04:12
toothe:04:13
→ spinning1 joined04:13
→ reim joined04:17
→ dsdeiz joined04:19
→ daito joined04:19
← variable left04:20
← jottr left04:20
→ chris_wot joined04:21
← MattMaker left04:22
← irc-5225225 left04:23
← daito left04:24
← spinning1 left04:24
toothe yes.04:25
just a sec, let me re-check this...04:25
→ mehola joined04:25
toothe so, I created a new remote bare repo -- nothing in it04:27
and I changed the remote repository origin to being securityplan.git04:27
prooftechnique What error do you get?04:28
toothe everything is up to date.04:28
→ samw joined04:28
toothe so, I'm trying to push a branch, not master.04:28
prooftechnique Did you set the upstream?04:28
git push -u origin/<upstream branch name>04:29
toothe I don't think so.04:29
oh, it has no upstrema branch.04:29
→ Jusle_ joined04:29
prooftechnique Oh, sorry, it's actually git push -u origin branch_name04:30
No /04:30
My bad04:30
toothe ?04:30
prooftechnique I wrote the command wrong the first time04:30
toothe oh...04:30
→ sitaram joined04:30
← sitaram left04:30
→ sitaram joined04:30
toothe the second line?04:30
prooftechnique Yeah. Say your branch is called my_feature. You'd checkout the branch locally (git checkout my_feature), then git push -u origin my_feature04:31
toothe tries.04:31
→ Jusle___ joined04:31
→ rkazak joined04:32
← Jusle left04:32
← samw left04:32
toothe there it goes...04:32
so, i figured just doing `git push` would push the branch.04:33
odd...04:33
→ nightfuri joined04:33
prooftechnique You might be able to get away with git push --all, but I don't remember if that sets up upstream branches04:33
← weox left04:33
toothe can I delete an upstream branch?04:33
i man...04:34
delete an origin/upstream remote?04:34
sorry if my terminology is wrong.04:34
← Jusle_ left04:34
prooftechnique git push origin :my_feature04:34
kadoban You can delete a branch on a remote, yes.04:34
toothe sorry,i meant to say remote.04:35
because I renamed my earlier origin, and then created a new one.04:35
→ MattMaker joined04:35
prooftechnique Oh, yeah04:35
kadoban man git remote04:35
gitinfo the git-remote manpage is available at http://jk.gs/git-remote.html04:35
kadoban There should be one in there for it.04:35
toothe thanks!04:35
→ mizu_no_oto joined04:35
→ ryanar joined04:36
prooftechnique Oh, and I forgot there's easier syntax for deleting remote branches, now04:36
→ bronson joined04:36
prooftechnique The much easier to remember git push origin --delete my_feature04:36
← Jusle___ left04:36
kadoban I always forget that exists … I just remember the : thing.04:36
← MattMaker left04:37
toothe rtfm04:37
→ irc-5225225 joined04:38
← kfunk left04:39
← ryanar left04:40
← hashpuppy left04:41
← bronson left04:41
→ Lyqyd joined04:41
→ kfunk joined04:42
← sitaram left04:44
← Sucks left04:44
→ cmoneylulz joined04:45
→ piklu joined04:45
piklu Hi04:46
gitinfo piklu: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.04:46
piklu can someone tell me04:46
how shall I revert the entire git to a particular commit - all files04:46
and push these changes04:46
→ Sucks joined04:46
kadoban !revert04:47
gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?04:47
→ blackpajamas joined04:47
→ huntleja joined04:48
toothe thank you!04:48
i always foretthis...04:48
foret how this works.04:48
piklu ya but how do I push it04:49
once I reset it04:49
← codepython777 left04:49
piklu I tried git reset -- hard $COMMIT04:49
but than it says ur branch is behind kind of thing04:49
Updates were rejected because the tip of your current branch is behind04:50
→ sitaram joined04:51
← bruce__lee left04:51
huntleja on a reset you'd have to force push.04:52
piklu and it says than branch is protected04:53
kadoban piklu: You understand that what you're trying to do is modify published history? That's usually not a good idea unless you know exactly what you're doing.04:53
piklu yes04:53
i know04:53
huntleja this on github?04:53
kadoban piklu: Well, it sounds like the remote is set up to not allow you to force push, probably.04:54
← sparetire left04:55
→ cabargas_ joined04:56
← cabargas left04:56
← rkazak left04:56
← Kyle_j left04:59
← dermoth left05:00
→ dermoth joined05:00
toothe thanks a lot!05:01
i always forget how tod o this05:01
so, i don't get what I just did though. the -u flag means....i guess i'll rtfm05:01
→ Guest37376 joined05:02
← blahdodo left05:02
→ yaewa joined05:03
← cmoneylulz left05:03
→ tildes joined05:04
← moei left05:04
→ moei joined05:07
→ lindenle joined05:07
→ blahdodo joined05:08
→ spinning1 joined05:08
→ aidalgol joined05:08
← ErKa left05:09
← dsdeiz left05:09
→ nettoweb joined05:10
← yaewa left05:10
← eka left05:11
← nettoweb left05:15
→ eka joined05:16
→ intrigueD joined05:17
← JackFruh left05:22
→ muthu joined05:24
← meloc left05:25
→ MarkyC joined05:25
← spinning1 left05:26
← MarkyC left05:28
→ whitby joined05:29
← mizu_no_oto left05:29
← fbwnd left05:33
→ spinning1 joined05:34
← Cabanossi left05:35
→ Cabanossi joined05:37
← whitby left05:39
← sparetire_ left05:44
→ bahamut24 joined05:46
→ rkazak joined05:47
karstensrage is there a way to tag a commit for a notation, like i removed some functionality05:49
← basiclaser left05:49
karstensrage but i want to be able to "star" the commit to remember it later when i want to add the functionality back05:49
kadoban karstensrage: A tag comes to mind, git has those05:51
← moobee left05:52
→ samw joined05:53
→ tmanderson joined05:56
← huntleja left05:56
← gusnan left05:58
← samw left05:58
← intrigueD left05:59
→ gusnan joined06:00
← gusnan left06:00
→ gusnan joined06:00
→ intrigueD joined06:00
→ jkahn joined06:01
← modocache left06:01
← fahadash left06:01
→ samw joined06:04
← intrigueD left06:04
→ sauvin joined06:06
← rkazak left06:06
→ meloc joined06:10
← samw left06:12
← jkahn left06:12
→ samw joined06:13
→ ErKa joined06:13
← cabargas_ left06:16
← sargas left06:18
← blur3d left06:19
→ daito joined06:20
→ jolts joined06:20
→ lkirk joined06:21
← sdothum left06:24
← daito left06:25
→ nnyk joined06:25
→ david007 joined06:25
← aidalgol left06:25
← samw left06:26
→ dantix joined06:26
← fstd left06:27
→ fstd joined06:27
→ aidalgol joined06:28
→ david002 joined06:29
← david007 left06:29
→ samw joined06:31
← ytl left06:35
← dreiss left06:36
→ bronson joined06:37
← strayPuppy left06:37
→ fstd_ joined06:38
← fstd left06:38
← fedexo left06:38
← fstd_ left06:39
→ fstd joined06:39
← s00pcan left06:40
→ armyriad joined06:42
← bronson left06:42
→ jetpack__ joined06:42
→ fedexo joined06:43
→ bket joined06:43
→ jam__ joined06:44
← david002 left06:44
← samw left06:45
← jam__ left06:48
→ boudicca joined06:50
→ petersr joined06:50
← petersr left06:52
→ freimatz joined06:52
→ phaleth joined06:53
← boudiccas left06:53
← tildes left06:54
→ alekks joined06:55
→ samw joined06:55
→ LucaTM joined06:58
← subbero left06:59
→ david002 joined07:00
← alekks left07:00
← monkeyisl left07:02
→ monkeyisl joined07:02
← samw left07:03
→ dopesong joined07:05
→ samw joined07:06
← bb010g left07:08
→ tildes joined07:09
→ blur3d joined07:11
← fscala left07:13
boudicca → boudiccas07:15
← samw left07:15
→ fscala joined07:16
→ cyan__ joined07:16
← fedexo left07:17
→ rkazak joined07:20
← nachoman left07:22
→ dc5ala joined07:23
← jolts left07:24
← Sucks left07:24
← crayon left07:26
→ emPi joined07:26
→ Manikandan joined07:28
→ crayon joined07:29
← blackpajamas left07:32
→ samw joined07:33
→ elastix joined07:35
→ wrouesnel1 joined07:36
← Lyqyd left07:36
← Levitator left07:36
← samw left07:37
→ subbero joined07:39
→ s00pcan joined07:41
← nnyk left07:43
→ samw joined07:48
→ fbwnd joined07:50
← crayon left07:52
→ crayon joined07:52
→ Macaveli joined07:53
← crayon left07:54
← Macaveli left07:54
← Wetmelon left07:55
← SimonNa left07:55
← samw left07:56
→ dreiss joined07:57
→ flughafen_ joined07:57
→ huntleja joined07:57
→ adaccada joined07:58
← amdi_ left08:02
→ samw joined08:02
← Gamecubic left08:03
← dantix left08:04
→ t4nk590 joined08:05
→ daito joined08:06
← felixn left08:09
← opal left08:09
← spinning1 left08:10
← aidalgol left08:10
← daito left08:10
← samw left08:10
→ acetakwas joined08:11
← GuKKDevel_ left08:12
→ GuKKDevel joined08:12
← eka left08:14
→ nidr0x joined08:15
→ eka joined08:15
→ samw joined08:15
← jagob left08:16
← boombatower left08:17
← dreiss left08:20
→ crayon joined08:21
← nydel07 left08:23
← Chill-Surf left08:24
← samw left08:24
→ samw joined08:26
← crayon left08:29
← huntleja left08:31
→ FunkyAss joined08:33
→ skylite joined08:34
→ jagob joined08:35
← fastercat left08:35
← wwwbukolaycom left08:35
→ crayon joined08:36
← flughafen_ left08:37
gitinfo set mode: +v08:39
t4nk590 silly question: when i'm setting up a post-receive hook like this https://www.filosophy.org/post/33/dead_simple_git_deployment/ where should the files I'm pushing be found (let's assume I used the same directories as the article for simplicity sake)08:39
← samw left08:40
← rkazak left08:41
← Annihitek left08:41
← ErKa left08:42
kadoban t4nk590: I don't understand the question.08:44
← lkirk left08:44
→ Annihitek joined08:44
→ jam__ joined08:45
→ toogley joined08:45
t4nk590 I must be missing something very basic. I set everything up, push, and it appears to have worked, but the files that I pushed to the server aren't there08:45
pothepanda t4nk590: the files you are pushing should be in a local repo i guess08:46
t4nk590 right, so i have a local repo, commit, and then do git push origin master. It looks like it's pushing, but then the files never show up on the server?08:47
← lindenle left08:47
pothepanda theres somebody told me git is not a deployment tool :D08:47
yes that would be in GIT_REPO path08:48
kadoban t4nk590: I would recommend just not using git for deployment, especially if you're not super comfortable with git yet. It's not a good deployment tool … it's actually not a deployment tool at all, but you can trick it to be one, if you know what you're doing and are very bored or something.08:48
t4nk590: Just use rsync or whatever you'd normally use, and keep 'git' as a version control system for now (or forever)08:48
pothepanda no t4nk590 it should be in PUBLIC_WWW but kadoban is right. i came up with the same thing a few days ago08:49
t4nk590 haha fair enough. I've used github a lot, but I've never been the one to set up the deployment; didn't even realize that wasn't best practice08:49
← jam__ left08:49
pothepanda !deploy08:49
gitinfo Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html08:49
pothepanda ^^08:49
kadoban Other people have a less-strong opinion on it, or a differing opinion … but I tend to think it's just a waste of time. It's usually *worse* than not setting it up in the first place every time I've done it.08:50
t4nk590 no that's good to know. I'm not particularly partial to it, it just seemed like the most obvious tool in the bag. Good to know that it's not08:50
← dc5ala left08:51
→ UbuntuDude joined08:51
t4nk590 thanks kadoban & pothepanda!08:52
pothepanda t4nk590: yw :)08:52
UbuntuDude I've went to update EGit from http://download.eclipse.org/egit/updates .. but eclipse still showing me this error http://snag.gy/1aTkh.jpg .. Will any body help me fix this please?08:52
also asking in #java will make a big fuss08:53
→ wzy joined08:53
← acetakwas left08:53
kadoban UbuntuDude: This is the first time I think I've ever seen anyone ask about EGit here, I'm pretty doubtful you'll get an answer. Somewhere eclipse or java or egit specific will probably be a better bet.08:54
→ wwwbukolaycom joined08:55
← wwwbukolaycom left08:56
UbuntuDude kadoban: #eclipse is not really active .. #java has the worest mental admin who considers anything related to eclipse or plugins as an off-topic and makes a mountain of a molehill. I couldn't find #egit or #jgit08:57
but yeah I'll ask an see his freak atittude again08:58
pothepanda heheh08:58
let me see that08:58
← joki left08:58
← JanC left08:59
kadoban UbuntuDude: There are support channels outside of IRC, hard as it is to believe ;) Though I don't know if one exists for EGit or whatever.08:59
← joako left08:59
→ joako joined09:01
→ acetakwas joined09:03
→ joki joined09:03
← fbwnd left09:04
→ samw joined09:04
UbuntuDude ok np09:04
→ fastercat joined09:07
← snail1 left09:08
← samw left09:12
→ MattMaker joined09:12
→ JanC joined09:12
← MattMaker left09:13
→ samw joined09:13
← Goplat left09:20
→ thiago joined09:20
← acetakwas left09:21
→ katherine joined09:21
→ fbwnd joined09:21
→ acetakwas joined09:22
← acetakwas left09:23
→ blackwind_123 joined09:24
→ acetakwas joined09:26
← subbero left09:27
← UbuntuDude left09:27
← acetakwas left09:27
← samw left09:27
← gusnan left09:27
→ subbero joined09:27
→ acetakwas joined09:28
→ gusnan joined09:29
← t4nk590 left09:29
← jagob left09:29
← feliwir left09:29
← acetakwas left09:29
← wzy left09:30
→ moobee joined09:30
gitinfo set mode: +v09:30
← gusnan left09:30
→ wzy joined09:30
→ MattMaker joined09:33
→ rubyonrailed joined09:36
→ samw joined09:36
→ Gloomy joined09:37
← rubyonrailed left09:37
→ rubyonrailed joined09:37
← MattMaker left09:38
← rubyonrailed left09:38
→ rubyonrailed joined09:40
← samw left09:41
→ MattMaker joined09:41
→ pantsman_ joined09:42
← mehola left09:42
← blahdodo left09:45
← moobee left09:48
→ samw joined09:50
→ King_Hual joined09:52
→ spinning1 joined09:54
← jetpack__ left09:54
← King_Hual left09:54
→ lindenle joined09:54
→ King_Hual joined09:55
← King_Hual left09:55
→ King_Hual joined09:55
→ daedeloth joined09:56
→ blahdodo joined09:57
← thiago left09:57
→ nisseni joined09:58
← skylite left09:58
← fbwnd left09:59
← McNozes left09:59
← samw left10:00
← spinning1 left10:00
← MattMaker left10:00
→ MattMaker joined10:01
← blahdodo left10:02
→ Dyonisos joined10:03
← emPi left10:03
→ McNozes joined10:04
→ samw joined10:05
→ emPi joined10:05
→ blahdodo joined10:05
→ jam__ joined10:06
→ daito joined10:07
← watabou left10:07
← nisseni left10:08
→ a_thakur joined10:09
← a_thakur left10:10
← jam__ left10:10
→ spinning1 joined10:11
← daito left10:11
→ King_Hual` joined10:14
← david002 left10:14
← deepy left10:14
→ deepy joined10:15
← Phanes- left10:15
→ beastd joined10:15
← King_Hual left10:17
→ glebihan joined10:18
← Gloomy left10:18
← samw left10:19
→ ocbtec joined10:20
→ jost joined10:20
← spinning1 left10:23
→ Phanes joined10:26
← Phanes left10:26
→ Phanes joined10:26
→ samw joined10:27
→ fbwnd joined10:27
→ zeroed joined10:29
← ggherdov_ left10:29
→ ggherdov_ joined10:29
← ggherdov_ left10:29
→ ggherdov_ joined10:29
ggherdov_ → ggherdov10:29
← blahdodo left10:29
→ HelloAtMega joined10:30
→ gusnan joined10:33
← gusnan left10:33
→ gusnan joined10:33
→ shaggycat joined10:33
→ blahdodo joined10:34
→ jorj joined10:35
→ subscope joined10:35
→ nitin_ joined10:35
← samw left10:38
← melter left10:38
→ t0by joined10:38
→ Balliad joined10:40
→ samw joined10:42
← CEnnis91 left10:45
← freimatz left10:46
→ freimatz joined10:46
← subscope left10:47
→ The_Phoenix joined10:48
→ subscope joined10:48
← fbwnd left10:49
← happy-dude left10:49
← ocbtec left10:49
→ Guest27 joined10:51
→ The_Phoenix1 joined10:51
← The_Phoenix left10:52
← nitin_ left10:52
→ melter joined10:53
→ The_Phoenix joined10:55
← The_Phoenix1 left10:56
→ avar joined10:56
← lindenle left10:57
→ nisseni joined10:58
← The_Phoenix left10:59
→ dantix joined11:00
← samw left11:00
→ Limes_ joined11:01
← subscope left11:01
→ subscope joined11:01
← GandalfTheWizard left11:02
→ realtime_ joined11:02
→ mohabaks joined11:02
← realtime left11:04
→ yereby joined11:04
→ Jackneill joined11:04
← Balliad left11:05
→ tif__ joined11:06
→ flavi0 joined11:07
→ liranp joined11:07
← realtime_ left11:07
← shaggycat left11:07
→ shaggycat joined11:08
shaggycat hi all11:08
I got massive automerge becouse I'm stupid :) But I can't revert it! if I use git diff-r stupid-commit previous-commit I did not see anything strange11:09
only changing in one file11:09
← nisseni left11:09
j416 shaggycat: git diff-r is not a command11:10
shaggycat: git diff HEAD^11:10
shaggycat yearh, git diff11:10
→ samw joined11:10
j416 shaggycat: or git diff <previous> <current>11:10
shaggycat -r probaly in svn11:10
but i'm not sure11:10
j416 git ≠ svn11:10
shaggycat yes11:10
I did it11:11
and not any changes11:11
only one file11:11
j416 so that is what happened.11:11
shaggycat but in gitlab this commit changed 69 files11:11
j416 the merge commit?11:11
shaggycat j416: yes, stupid11:11
automerge11:11
may be time of files11:12
or anything else,11:12
j416 git diff is correct11:12
gitlab may be caching something or whatnot, not sure what it's doing11:12
shaggycat but my commit changed 69 files in remote11:12
j416 gitlab has been wrong before (we use it at work, I know)11:12
← mohabaks left11:12
j416 shaggycat: just because a branch changes a lot of files, that does not necessarily mean that those files are modified in the merge commit.11:13
shaggycat j416: I got same situation a half of year11:13
It was atime11:13
in linux file system11:13
j416 shaggycat: if the correct files already exist in the branch you are merging into, then there will be no chang11:13
change*11:13
shaggycat: can you share this repo?11:14
shaggycat no, here is private info. I can't11:14
j416 well, git diff is telling the truth, it does not even use atime.11:14
!lol might help you understand what happened.11:14
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all11:14
← emPi left11:15
BlessJah j416: from my experience user is much more likely to be wrong than gitlab11:15
j416 BlessJah: that depends on the user11:15
BlessJah the kind of user you're thinking about would've found soution on his own11:16
shaggycat but in fact, one service realy broken11:16
after my automerge11:16
→ nnyk joined11:16
j416 BlessJah: indeed.11:16
BlessJah: I try to be kind. And I did suggest ! lol. .)11:16
→ muld joined11:17
j416 shaggycat: did you try the command above?11:17
→ apiw joined11:17
→ mohabaks joined11:17
← HelloAtMega left11:18
shaggycat j416: no, and I listen about it at first11:18
j416 try it11:18
shaggycat https://www.google.ru/search?q=git+above&oq=git+above&aqs=chrome..69i57j0l2j69i64l2.3215j0j7&sourceid=chrome&es_sm=0&ie=UTF-8#newwindow=1&q=git+%22above%2211:18
are you really mean "above"?11:19
j416 I really mean above, but not literally.11:19
12:14:44 j416 | !lol might help you understand what happened.11:19
12:14:44 @gitinfo | A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --al11:19
gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all11:19
→ tristanp_ joined11:19
→ muld25 joined11:20
BlessJah --stat may be useful as well11:20
← tpollard left11:20
shaggycat aah11:20
← samw left11:20
shaggycat I think, you mean git above :))11:20
and my brain freezing :)11:21
I run it (git log --oneline --graph --decorate --all )11:21
and I didn't see anything interesting11:21
j416 could you paste what you see?11:21
(in a pastebin, not here)11:21
← tristanp left11:22
← muld left11:23
← apiw left11:23
shaggycat j416: http://pastebin.com/gg5KQVJ911:23
← zeroed left11:24
→ shiriru joined11:25
j416 shaggycat: try: git diff --stat c6ddd74^..76aa9ef11:25
shaggycat: how many files changed?11:25
shaggycat 3 files changed, 5 insertions(+), 5 deletions(-)11:26
mistic :(11:26
j416 git diff ad840ea^..ad840ea --stat11:27
how many files?11:27
shaggycat 6911:27
j416 so, not 1 as you say11:27
shaggycat probably this is it. I see here changes in some scripts, what I didn't changing (of cource, It change I, by automerge, but I don't want do it)11:29
j416: do you understand, what happened?11:29
→ samw joined11:29
j416 shaggycat: you typed the wrong command when you diffed it11:30
→ apiw joined11:30
← pantsman_ left11:30
→ nachoman joined11:30
j416 "12:09:21 shaggycat | only changing in one file"11:30
what command did you run to get this?11:30
→ PHPanos joined11:30
shaggycat git diff...11:31
j416 the full command11:31
→ zeroed joined11:31
shaggycat I've close this console :(11:31
and it isn't in bash_history11:31
← zeroed left11:31
→ zeroed joined11:31
BlessJah may I? git diff --shortstat 76aa9ef..$(git merge-base ad840ea^1)11:32
j416 was it by any chance: git diff 76aa9ef..ad840ea ?11:32
BlessJah a.k.a. "So what actually happened on the other branch?"11:32
← ShapeShifter499 left11:33
j416 BlessJah: a.k.a. git diff ad840ea^..ad840ea^211:33
→ hardenedapple joined11:34
← apiw left11:34
← nachoman left11:34
← subscope left11:35
BlessJah j416: nope, commits may be hiding between merge-base and HEAD^211:35
shaggycat yes, I see in git diff ad840eacdb61ca9f3ed590f0f357ae26a9d7719f adbfd8d9f5cfa9cc2be79d6ce2ae389f7b4ed4ae11:36
here is 69 files changed11:36
thanks all for help. I'm stupid :)11:36
j416 you're welcome11:37
shaggycat But I don't understand,11:37
BlessJah HEAD^1..HEAD^2 is usually just a bag of changes from one and other path (with lovely mixed additions and deletions)11:37
shaggycat why git checkout adbfd8d9f5cfa9cc2be79d6ce2ae389f7b4ed4ae11:37
and copy to another folder,11:37
and git master,11:37
git checkout master11:37
→ Balliad joined11:37
shaggycat and copy from another folder in git (whithout .git dir of cource),11:38
and git commit -am 'revert stupid merge'11:38
does not provide changes in files?11:38
not 6911:38
files changed11:38
j416 BlessJah: ah yes you are right, may have been merges between11:39
BlessJah no, not merges, just commits11:39
j416 that too11:39
shaggycat how to revert this stupid commit?11:39
← samw left11:39
shaggycat why just coping does not work?11:40
j416 BlessJah: though, a.k.a. ad840ea^...ad840ea^2 right?11:40
shaggycat In same situations (more times, hundreds)11:40
it works11:40
j416 shaggycat: !backup first11:40
gitinfo shaggycat: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups11:40
shaggycat but not today11:40
j416 shaggycat: after backup; git reset --hard HEAD^11:40
shaggycat: then you can redo it in some way11:40
→ subscope joined11:40
BlessJah reset is a bad idea11:40
j416 shaggycat: not that the above will remove changes, so _do backup_.11:41
→ fees joined11:41
j416 BlessJah: he's all yours11:41
BlessJah shaggycat: gimme few seconds11:41
← kadoban left11:41
← wzy left11:41
→ wzy joined11:42
BlessJah shaggycat: https://raw.githubusercontent.com/emmajane/gitforteams/master/resources/workflow-undoing-merge.png11:43
→ endiruna1 joined11:43
BlessJah probably first place to look for such instruction should be git-scm (https://git-scm.com/blog/2010/03/02/undoing-merges.html)11:43
but personally I find gitforteams better (and hey! it's a graph!)11:44
→ samw joined11:44
← muld25 left11:44
BlessJah shaggycat: do you need help walking through workflow-undoing-merge?11:45
j416 "has the branch been published" is a bad way of saying "do you want to rewrite history" :/11:45
(with an added negative..)11:45
BlessJah yep, few things could use better choice of words11:46
→ heroux joined11:47
BlessJah also push --force-with-lease is missing solution for repos used by only one person (and having only one clone)11:47
← hardenedapple left11:47
→ LarArT joined11:47
← tomzx left11:47
← blur3d left11:48
→ HelloAtMega joined11:48
→ blur3d joined11:48
BlessJah j416: and that backup thing, did you know http://think-like-a-git.net ?11:50
← jost left11:51
→ fees__ joined11:51
j416 I have not seen this site11:51
→ flughafen_ joined11:52
BlessJah something about 30 minutes I think, really worth it11:52
http://think-like-a-git.net/sections/experimenting-with-git/my-humble-beginnings.html11:52
j416 why does it talk about subways and not even mention a word about git hm http://think-like-a-git.net/sections/graph-theory/attaching-labels-to-nodes.html11:52
← samw left11:52
← katherine left11:52
→ hardenedapple joined11:52
j416 BlessJah: yes, that's what I suggested above, backup the entire directory? :)11:52
← tristanp_ left11:53
→ mischat joined11:53
shaggycat thank you guys11:53
→ tristanp joined11:53
→ jost joined11:53
→ samw joined11:54
BlessJah j416: read the "When I finally realized..." part as well :>11:54
shaggycat: have you successfully reverted that merge?11:55
j416 read it yes11:55
→ mwhooker joined11:55
→ tinajohnson__ joined11:56
shaggycat BlessJah: yes, by simple way11:56
BlessJah simple way being...?11:56
shaggycat BlessJah: by git checkout good-commit; cp to another dir,11:56
BlessJah oh ok11:57
shaggycat git checkout to the head,11:57
BlessJah next time you may use git checkout good-commit -- .11:57
shaggycat and cp from another dir in this11:57
BlessJah saves you the cp step11:57
but you need to run from top-level directory of you repository11:57
j416 don't forget to remove files before you cp back11:57
shaggycat i did not understand,11:58
j416 shaggycat: before you copy the files back, remove all the files there (except .git)11:58
shaggycat why my simple way does not work before I loged to channel11:58
It worked11:58
j416 shaggycat: otherwise you will risk re-adding files that may have been removed11:58
shaggycat during last year :)11:58
j416 I'm not sure your definition of "it works" matches mine.11:58
BlessJah shaggycat: spend an hour and learn git revert --mainline <N> <merge-commit>11:59
→ tomzx joined11:59
→ xaa joined12:00
← shiriru left12:00
← blur3d left12:00
→ Boniche joined12:02
j416 BlessJah: I read through most of that site, and while it perhaps has some points, I think it's still too much of a birds-eye view12:02
BlessJah: the graph is not the hard part, the hard part is to learn what commands do what -- I think?12:03
BlessJah nope, that's what cheatsheets are for12:03
j416 that's not what I mean12:03
← irc-5225225 left12:04
j416 even if you understand the graph, you need to grasp how to manipulate it, and cheatsheets are often "undo a merge? git reset HEAD^"12:04
and that does not translate to the graph12:04
(ambiguous912:05
)12:05
→ Gloomy joined12:05
← PHPanos left12:06
← mischat left12:06
BlessJah git reset HEAD^ is just user copypasting commands from random blogs on the internet12:06
→ jam__ joined12:07
→ daito joined12:07
BlessJah you could do magic things with just commit, merge, checkout and branch12:07
→ tens0r joined12:07
← samw left12:08
BlessJah log would be useful as well12:08
← nnyk left12:08
← Guest27 left12:09
→ Guest27 joined12:10
→ Kicer86 joined12:10
_ikke_ There is a discussion going on (around GSoC) about either making a safer version of git (less likely, hard to define), or making it easier to undo even destructive commands12:10
→ tristanp_ joined12:10
j416 _ikke_: very interesting12:10
← tens0r left12:10
cbreak safer?12:10
BlessJah _ikke_: there already is reflog12:11
cbreak git is extremely safe, by comparison :)12:11
_ikke_ BlessJah: Yes, but that doesn't help against reset --hard, git clean, etc12:11
cbreak ok, it is written in a bad language, C12:11
← jam__ left12:11
cbreak but still, the bugs it contains don't seem to be too bad so far12:11
BlessJah _ikke_: on the other hand making CLI more sane...12:11
← daito left12:11
cbreak the command line in git is quite sane12:12
← tristanp left12:12
j416 I think that is hard for us to really judge, we are all used to it12:12
cbreak there are weird aspects, like checkout, reset, doing different things depending on how they are used12:12
_ikke_ BlessJah: But that is harder then it sounds12:12
← zeroed left12:12
_ikke_ without giving up gits power / flexibility12:13
BlessJah _ikke_: just rename bunch of commands, split them or merge and it'd be fine12:13
_ikke_ BlessJah: Yes, but what's logic for one person is random / arbitrary for another12:13
BlessJah cbreak: like checkout being primarly for operating on branches/HEAD but hey, how about adding checkout -- <file> thing?12:14
current CLI is random12:14
cbreak BlessJah: yeah, or checkout -p, or checkout --ours / --theirs12:14
→ tens0r joined12:14
_ikke_ I don't deny that12:14
j416 I think that was the original point.12:15
_ikke_ I can argue that those commands make sense, but that's because I know what they do12:15
cbreak indeed12:15
they totally make sense once you're used to them :D12:15
← mwhooker left12:16
BlessJah never got why it's reset job to mess with staging12:16
_ikke_ Lots of these 'arbitrary' functions of commands happen because they have lots of overlap of what the commands already do12:16
BlessJah: Because otherwise you almost always want a combination of reset + checkout12:17
← blahdodo left12:17
BlessJah if "almost always" why do we need extra step then?12:18
_ikke_ BlessJah: What you suggest easily results in an explosion of commands12:18
→ irc-5225225 joined12:18
→ m0viefreak joined12:18
_ikke_ BlessJah: We don't because it already doe it12:18
does it12:18
← MindfulMonk left12:18
BlessJah why not just git checkout HEAD -- <file> :>12:18
→ leeN joined12:19
_ikke_ git reset -- file does something different12:19
BlessJah it unstages file'12:19
_ikke_ yes12:19
BlessJah and what checkout HEAD -- <file> do?12:19
_ikke_ It undoes the changes to that file12:20
BlessJah nothing to commit, working directory clean12:20
_ikke_ ..?12:20
→ blahdodo joined12:20
BlessJah it seems that I misunderstood the point here12:20
_ikke_ BlessJah: Please understand me, I don't deny things can be improved, but I also see that it's not as easy as everyone makes out12:20
→ MindfulMonk joined12:21
← d1b left12:21
BlessJah I know. I may be blinded by lot of low hanging fruit.12:22
j416 that's a nice expression, I'll steal it for the future. thanks12:23
_ikke_ One low-hanging fruit I see is unstage, basically an alias to git reset --mixed12:24
→ d1b joined12:25
BlessJah we've got bunch of branch operations, like creating (branch), switching between (checkout) or forcing a new commit (reset)12:25
← Atm0spher1c left12:25
→ nwkj86 joined12:26
j416 _ikke_: what forum is this GSoC discussion going on in?12:26
_ikke_ j416: git mailing12:26
list12:26
j416 thanks12:26
BlessJah why not just git branch? git brach add, git branch switch, git branch set (or add --force, since it's harder to find for newbie)12:27
_ikke_: are you git dev?12:27
_ikke_ BlessJah: What if you want to create a branch and immediately switch to it12:27
BlessJah: I have submitted some patches, but I'm not a regular dev12:27
BlessJah either you don't or stick to current cli12:28
← MindfulMonk left12:28
BlessJah that's the cost of simplifying things12:28
_ikke_ Yes12:28
but then you get people complaining about that12:29
→ sdothum joined12:29
_ikke_ I more often use git checkout -b then git branch12:29
← flavi0 left12:30
_ikke_ That's the difficult part I talk about12:30
BlessJah I more often git worktree than checkout -b, but my use case is bizzare12:30
_ikke_ yes, but then you would be already considered a poweruser I guessw12:31
← Guest27 left12:31
BlessJah yep, that's true12:31
_ikke_ people coming from svn are more used to it I think, but for me it's a rather anoying workflow12:31
→ samw joined12:32
→ tureba joined12:32
BlessJah used to what?12:32
_ikke_ having several working trees12:32
BlessJah oh... trunk_01 trunk_02 trunk_0312:32
← endiruna1 left12:33
_ikke_ yeah, of for different branches12:33
s/of/or/12:33
→ TomyLobo joined12:33
BlessJah I think stash was supposed to solve the problem?12:33
j416 different use-case12:33
_ikke_ BlessJah: Because git is distributed, it's much easier to temporarily commit something12:34
in svn, people are much more reluctant to commit until it was completely finished12:34
BlessJah actually two use-cases and workaround or three?12:35
j416 one use-case for worktree that can _only_ be solved by something like worktree (or a separate clone), is running tests or compiling locally while continuing work (if you have a long-running test suite or compilation process)12:35
_ikke_ right12:35
BlessJah 1. Switching between branches is so slow, so it's better to just checkout12:35
2. Checkout are so slooow so it's better to have them already prepared12:35
← cagedwisdom left12:36
_ikke_ 3. Commits are permanent, so better checkout another working tree12:36
BlessJah and there is no stash, so better have 3 or 4 of them in case you wanted do some side-quest in the meantime12:36
_ikke_ right12:36
← de-vri-es left12:36
BlessJah _ikke_: for newbies something that is commited, is commited12:37
cannot be reworked other way that commited on-top and maybe rebase-squashed later12:37
j416 BlessJah: that depends on where you're coming from12:37
_ikke_ BlessJah: git commit --amend12:37
→ de-vri-es joined12:37
grawity in Git, cannot be reworked the other way without some magic12:37
in other VCSes, cannot be reworked the other way without *a lot* of magic12:37
_ikke_ And you immediately affect other people12:38
in non-distributed scms12:38
BlessJah _ikke_: then you're just rolling snowball :>12:38
_ikke_ BlessJah: Sorry, that expression is unfamiliar to me12:38
→ fracting joined12:39
_ikke_ At least, I don't understand it in this context12:39
BlessJah snowball is ball made of snow, you make one by making small fist-sized ball and rolling it over snow12:39
you're getting you commit bigger and bigger by amending more and more changes to it12:40
j416 BlessJah: a change can be a removal12:40
_ikke_ right12:40
BlessJah doesn't matter12:40
_ikke_ The commit doesn't need to get bigger12:40
← ikmaak left12:40
_ikke_ necessarily12:40
BlessJah oh, you can edit in-place so it won't get bigger and bigger12:41
j416 BlessJah: does matter, because then the snoball metaphor does not hold12:41
_ikke_ And the common suggestion is to keep your commits small12:41
BlessJah but anyway I prefer rebase-squash as last step before publishing (and by publishing I mean creating merge request)12:42
j416 BlessJah: that is analoguous to --amend12:42
_ikke_ automated amend12:42
BlessJah _ikke_: checkpoints/savepoints - you can trace back edits, you can undo some earlier steps12:43
_ikke_ I prefer smaller commits where seperate steps are explained individually12:43
j416 is off to town, nice chatting o/12:43
BlessJah o/12:43
_ikke_ \o12:43
→ diegoaguilar joined12:44
← d1b left12:44
_ikke_ But I do use rebase to fix small issues with commits instead of having correction commits later12:44
BlessJah fixup then12:45
_ikke_ BlessJah: in git.git for example, you sometimes see patch submissions with 20 commits12:45
BlessJah: yes12:45
← diegoaguilar left12:45
_ikke_ BlessJah: That makes it easier to review each commit seperately, instead of one big patch12:45
← samw left12:45
BlessJah depends on how big the patch is12:46
→ jost_ joined12:46
_ikke_ Sure, you don't want 20 patches with one line change per patch12:46
← mohabaks left12:47
→ diegoaguilar joined12:47
_ikke_ recent example: https://gist.github.com/Ikke/2e2c065f8402b8b246c212:47
← Hello71 left12:48
_ikke_ This is analoguous to one PR12:48
Just by reading the subjects I already get the gist of the changes12:49
← jost left12:49
BlessJah makes sense to me, guy did lot of small changes and want to get them in one MR as "various hardening improvements"12:51
_ikke_ Right. Not saying you do this, but lots of people insist in squashing all PRs into one commit12:51
BlessJah I ask to provide minimal number of commits.12:52
_ikke_ which to me looses a lot of valuable data12:52
right12:52
There is a balance to be found12:52
BlessJah I don't care how he got there, I'll either accept whole MR or reject it :)12:53
_ikke_ BlessJah: But his reasoning might help you understand the choices he made12:53
BlessJah I'm also more likely to revert whole merge rather than single commit from his MR12:53
_ikke_ It's not about accepting individual commits, but also understanding why a change was made12:54
BlessJah _ikke_: btw, my experience is from enterprise, not OS12:54
_ikke_ BlessJah: right12:54
Some of those principles still apply though12:54
→ samw joined12:54
← LarArT left12:55
BlessJah yep12:55
_ikke_ I'm currently the 'maintainer' in a small but still enterprisey situation12:55
← elastix left12:56
_ikke_ BlessJah: I want to know if the one who make the PR understands the consequences of his changes12:56
If they thought it through12:56
BlessJah they don't and you need to live with it12:57
_ikke_ Then I ask about it12:58
→ lindenle joined12:58
BlessJah wonders who has worse devs: OS with random kids from all over the world or enterprise with random post-graduates from local market12:58
_ikke_ Because I'm mainly responsible for the stability of the prodcut12:58
(internal, but still)12:58
bremner BlessJah: I think there is pretty wide variation in both cases12:58
→ ikmaak joined12:58
← fastercat left12:58
← fstd left12:59
_ikke_ git.git is a very disciplined project12:59
→ LarArT joined12:59
BlessJah _ikke_: each time I read this code I love how easy is to read and argue about it12:59
bremner in general there is a tradeoff between discipline / quality-control and attracting new people / drive-by contributions. Different people make different choices there12:59
→ fstd joined13:00
_ikke_ right13:00
Also depending on the impact13:01
← HelloAtMega left13:01
_ikke_ If git lands a buggy patch, lots of codebases may be impacted13:01
BlessJah yet nobody thought about .git/.Git issue before :D13:02
→ fommil joined13:02
_ikke_ There are still people involved13:02
→ ryanar joined13:02
← lindenle left13:02
tobias_ → tobias13:02
fommil hi, is there a way to turn a git linked file into a normal file on Windows? My CI tests fail on appveyor because I use symlinks.13:02
_ikke_ fommil: What do you mean with a normal file?13:03
BlessJah _ikke_: http://danluu.com/file-consistency/13:03
fommil I'm using this powershell script (it's just marking the files as unchanged) https://github.com/appveyor/ci/issues/650#issuecomment-185468130 but I really just want to say "just resolve this symbolic link to the underlying file"13:03
_ikke_ BlessJah: The title says it all :-)13:03
tobias fommil: which fs?13:04
← blackwind_123 left13:04
_ikke_ fommil: btw !assume13:04
gitinfo fommil: [!assume_unchanged] git update-index --assume-unchanged is sometimes suggested for keeping yourself from committing changes to a file, but it's actually a promise to Git that the file is identical to the committed version, to reduce unnecessary disk reads. Not only will Git feel free to discard the flag, it will also happily overwrite your changes whenever a checkout/merge/rebase/... updates it.13:04
_ikke_ fommil: (not sure if you aware of this)13:04
← samw left13:05
← ikmaak left13:05
BlessJah fommil: something like http://stackoverflow.com/questions/5917249/git-symlinks-in-windows13:05
→ blackwind_123 joined13:05
→ SimonNa joined13:05
→ tensor-dev joined13:05
fommil _ikke_: yes, I know what it does. AppVeyor is Windows, I'm not sure exactly which FS it is. I'm guessing that git itself understands which file the link is pointing to, rather than the FS13:05
→ ikmaak joined13:06
fommil _ikke_: you just gave me back my own reference ;-)13:06
_ikke_ fommil: git has a setting core.symlinks,13:06
← tens0r left13:06
tensor-dev → tens0r13:07
_ikke_ fommil: what reference?13:07
fommil: Just know that we come accros a lot of people here who shoot themselfs in the foot with --asume-unchanged13:07
fommil _ikke_: this setting sounds interesting. I might be able to use this13:07
_ikke_ fommil: but iirc, windows requries admin privileges for creating symbolic links13:07
fommil _ikke_: I linked you to github above, it is the script I'm using, referencing back to the link you just sent me. I think the SO answer was solving a different thing.13:08
tobias fommil: basically git will always talk about its internal way of doing symlinks, because its nicely layered away from the actual fs. but NTFS handles symbolic links way different than, say ext413:08
_ikke_ fommil: It was BlessJah who sent you a link13:08
tobias on ntfs symbolic links are not as transparent as they are on posix afaik13:08
fommil _ikke_: BlessJah ah, yes13:08
→ samw joined13:09
grawity they are transparent13:09
however only Administrators can create them, by default13:09
→ Kyle_j joined13:09
grawity so Git / msys doesn't bother with them13:09
_ikke_ right13:09
fommil I'll do a `git config core.symlinks false` then hard reset13:10
grawity but other than that, NTFS symlinks were actually created to be just like Unix symlinks13:10
← nanga left13:10
grawity and they work almost identically13:10
tobias grawity: does msys then fake symlinks in?13:10
→ muld25 joined13:10
grawity I think it does, yes13:10
tobias hah ;)13:10
well theres your problem13:10
grawity tbh I dunno13:10
but Cygwin has at least 3 ways of faking symlinks13:10
regular files with special content13:10
regular files with special content *in another format*13:11
tobias that could mean you have to be in that cygwin process to have those symlinks13:11
grawity and .lnk shortcuts13:11
tobias and that CI env is probably not running inside cygwin13:11
grawity msys isn't cygwin though13:11
_ikke_ tobias: on windows, git itself creates the 'link' files though13:11
tobias: where it sets core.symlinks to false13:12
grawity (and there's no such thing as "running inside cygwin", anyway)13:12
→ nanga joined13:12
→ d1b joined13:12
grawity tobias: the non-transparent thing you were thinking about might have been a) NTFS junctions, or b) Explorer .lnk shortcuts13:12
→ zeroed joined13:12
→ s9 joined13:12
← SimonNa left13:12
→ grillo joined13:13
← tildes left13:16
→ LeMike joined13:16
← samw left13:18
_ikke_ fommil: Not sure I understand you (I read your update on your issue on github), but iirc core.symlinks is already false by default on windows13:19
fommil: you can verify by executing git config core.symlinks on an existing repository13:20
→ PCatinean joined13:20
← tens0r left13:20
← ikmaak left13:21
→ PHPanos joined13:21
→ cigarshark joined13:22
← fees__ left13:22
fommil _ikke_: yeah, that didn't work. I don't have login on Windows, I'm running in CI so it takes a loooong time to run any commands.13:23
_ikke_: I'll try with true13:24
_ikke_ ok13:24
→ samw joined13:24
tobias grawity: i was thinking about junctions, yes13:25
grawity junctions *are* mostly transparent still13:25
tobias mostly, yes13:25
→ ikmaak joined13:27
→ nitesh`` joined13:30
← osse left13:30
→ osse joined13:30
← blurpeace left13:31
→ nitesh``` joined13:32
→ bbq joined13:32
← nitesh` left13:32
← Manikandan left13:33
→ jottr joined13:34
← frobnic left13:34
→ ysh joined13:35
→ basiclaser joined13:35
← nitesh`` left13:36
← ikmaak left13:36
← samw left13:37
← Kyle_j left13:37
← muld25 left13:39
← grillo left13:40
→ ikmaak joined13:40
kloeri → bosslady13:42
→ samw joined13:43
→ frobnic joined13:43
← PHPanos left13:45
→ CheckDavid joined13:46
← ikmaak left13:47
→ ikmaak joined13:51
→ Noldorin joined13:54
→ tildes joined13:54
← subscope left13:55
← samw left13:56
→ strozyka joined13:57
← raijin left13:57
← doener left13:58
→ nnyk joined13:58
← Ph_ left13:58
→ HelloAtMega joined13:59
→ Ph_ joined14:04
tobiasvl oh no someone named the same as me14:04
_ikke_ lol14:04
tobiasvl time to make my hilights less specific14:04
I mean14:04
more specific14:04
BlessJah gets lot of hilights from this channel14:05
BlessJah turns out people talk a lot about oBJects here14:05
tobiasvl lol14:05
_ikke_ haha14:05
tobiasvl that hilight could probably be set to just work on full words14:06
→ samw joined14:06
BlessJah been moderating some channels some time ago, people tried strange things just to check if I'll notice14:07
→ jam__ joined14:08
BlessJah and I've noticed all of them!14:08
→ daito joined14:08
bremner JahBless: orly.14:08
→ raijin joined14:09
BlessJah hiligh number 10.14:09
bremner sulks14:10
BlessJah bremner: anyway pretty low, 1-8 is various curses14:10
← PCatinean left14:10
_ikke_ BlessJah: Do you love to be highlighted or something? :P14:11
→ PCatinean joined14:11
← jam__ left14:12
← tildes left14:13
← daito left14:13
← wrouesnel1 left14:13
← ikmaak left14:13
BlessJah _ikke_: as I said, I've been moderating some channels, just wanted to be noticed when something interesting is going on14:13
→ tildes joined14:14
osse BlessJah: do you get notified when people use the F-word?14:14
BlessJah yep14:14
osse interesting14:15
_ikke_ We have enough ops here, so usually it's not important to get specifically highlighted14:15
→ ikmaak joined14:15
osse BlessJah: what about sfdsgfuckdfsfgd ?14:16
_ikke_ osse: if he already gets highlighted by objects, I would think so14:16
osse hmm yeah14:16
BlessJah actually I've been calibrated for polish curses, but yes, especially that you had to use right hand to type u, while sfdg and c are usually typed using left hand14:17
← PCatinean left14:17
BlessJah funny thing is when they we're misbehaving someone would say something like "shh... don't use f-word or bj will come and kick you"14:18
→ intrigueD joined14:18
BlessJah that's why I (as an op) useful to have hilights on my nick mistyped or twisted in some weird ways14:19
→ PCatinean joined14:19
← samw left14:19
← ikmaak left14:19
→ samw joined14:21
_ikke_ I must say we rarely have issues here14:21
→ saidi joined14:21
← saidi left14:21
→ saidi joined14:21
_ikke_ most people are civilized14:21
→ ikmaak joined14:22
→ variable joined14:22
→ iota_pi joined14:23
osse or we have a low standard of civilization14:24
→ DrSlony joined14:24
← Kulrak left14:24
← GuKKDevel left14:24
BlessJah sometimes they tried to be funny, sometimes obvious trolls got too obvious, sometimes it was funny to jump with "I see what you're talking about, I just have nothing to say" when someone hilighted me14:24
DrSlony Hello, I want to use git to create an archive of my project, like so:14:25
← adaccada left14:25
→ cagedwisdom joined14:25
DrSlony git config tar.tar.xz.command "xz -c -z -9e"14:26
git archive --format=tar.xz "$1" > rawtherapee-"$1".tar.xz14:26
but I also need to include a file foo.cmake in that tarball14:27
how do I do that?14:27
← King_Hual` left14:27
BlessJah you can either commit this file to repository, or create tar and xz in separate steps so you could add file to tar archive14:28
(bu if your tar supports adding files to tar.xz, you can use this path)14:28
← tureba left14:28
DrSlony yeah, cant i include it in the git archive command somehow?14:28
→ tureba joined14:29
_ikke_ no14:29
← tureba left14:29
→ tureba joined14:29
→ Hello71 joined14:29
← tureba left14:29
← strozyka left14:30
→ Manikandan joined14:30
→ tureba joined14:30
← samw left14:30
← wzy left14:31
→ wzy joined14:31
osse hmm14:32
tar can't append to an archive read from stdin14:32
DrSlony: why is the file not in git to begin with?14:33
_ikke_ usually because it's generated14:33
BlessJah then creating archive should be build step14:34
← saidi left14:35
← ikmaak left14:35
← daedeloth left14:36
← rubyonrailed left14:37
bosslady → kloeri14:37
→ Kulrak joined14:38
← Kulrak left14:38
→ Kulrak joined14:38
← FunkyAss left14:39
← nnyk left14:40
← wzy left14:41
ChanServ set mode: +o14:42
← Manikandan left14:42
osse would be cool if you could do: tar -cf - blablab | tar -Af - additional files > bleh.tar14:42
→ bronson joined14:42
osse but it seems tar can either read or write an archive to stdin/out, but not both14:43
qsx changed the topic to: Welcome to #git! Just don’t be an annoying git. | First visit? Read: http://jk.gs/git | Getting “cannot send to channel”? /msg gitinfo .voice | Current stable version: 2.7.1 | Ceci n’est pas une commit14:43
qsx set mode: +v14:44
qsx set mode: -o14:44
← variable left14:44
← Gloomy left14:44
→ vsanc joined14:44
→ ikmaak joined14:44
→ sanketdg joined14:45
→ mizu_no_oto joined14:46
→ sparetire_ joined14:46
_ikke_ This here is not a commit?14:46
← bronson left14:47
fommil _ikke_: coming back to the symlinks thing. I'm trying this out on a Windows 7 VirtualBox image and when I try the hack of enabling core.symlinks, then hard resetting, the symlink files are deleted!14:47
→ strozyka joined14:48
_ikke_ I think git is not able to create the actual symlinks14:48
→ nnyk joined14:48
fommil I don't really care about them being symlinks or not, I just want to get at the content14:49
if I use symlinks=false then the files contain the relative path to where they should go, if I use symlinks=true then they are removed.14:50
_ikke_ fommil: git does not store the contents14:50
← ikmaak left14:50
→ ocbtec joined14:50
_ikke_ for security reasons, git does not follow symlinks14:50
it only stores them as links14:50
→ zadock joined14:51
fommil well it works on whatever version of windows they use in appveyor, but not my Windows 7 image. Is there a way around that? A setting to say "follow the link please"14:51
→ ikmaak joined14:51
fommil or a command to go turn all files that contain a link path into a copied file14:52
← zeroed left14:52
← ocbtec left14:52
→ mezod joined14:54
→ jh3 joined14:54
→ Gamecubic joined14:54
→ subscope joined14:54
j416 fommil: I don't think git has anything for that; you could cp or rsync and have either of those follow links14:54
not sure if cp supports it; see manual14:54
← nwkj86 left14:55
→ dreiss joined14:55
← muthu left14:55
→ zeroed joined14:55
← vsanc left14:56
→ pantsman_ joined14:56
→ Kyle_j joined14:57
j416 afk14:57
qsx _ikke_: it's taken from the git-jokes repo14:57
→ CEnnis91 joined14:57
BlessJah is git translated?14:58
qsx yes14:59
BlessJah gots mixed feelings each time strictly developer tool is translated14:59
_ikke_ me either15:00
qsx yeah, well, LANG=C foo | fpaste15:00
_ikke_ But whole groups of people just don't understand english well enough15:00
qsx maybe i should change LC_MESSAGES ...15:00
→ lindenle joined15:00
← liranp left15:01
→ flavius joined15:02
BlessJah qsx: that's not how it works :(15:02
← devsterknight|ZN left15:02
→ devster31 joined15:02
← cigarshark left15:02
→ Juzzika joined15:02
→ dsdeiz joined15:03
← Balliad left15:04
← lindenle left15:05
_ikke_ :q15:05
-ENOTVIM15:05
→ slayerjain joined15:05
← subscope left15:05
→ ErKa joined15:07
→ subscope joined15:07
morfin git translated?15:07
hmm never thinked about that(i use english version)15:08
← zadock left15:08
→ intellix joined15:08
← fommil left15:09
_ikke_ me too15:10
wouldn't want something else15:10
→ adaccada joined15:11
← intrigueD left15:11
→ intrigueD joined15:11
← intrigueD left15:11
→ intrigueD joined15:11
← dstarh left15:12
osse _ikke_: :h bar15:12
→ liranp joined15:14
→ muld25 joined15:16
→ allgoodAtTaoti joined15:17
← LarArT left15:18
DrSlony osse its generated on the fly for os x users only and is valid only for the commit it was generated from, we dont want it in the repo15:19
← liranp left15:19
← t0by left15:19
osse makes sense15:19
← tinajohnson__ left15:19
DrSlony no problem though15:20
→ Wetmelon joined15:21
osse DrSlony: { git ls-files; echo foo.cmake; } | tar -T- -cf blah.tar.xz15:22
← Code_Bleu left15:22
→ Code_Bleu joined15:22
→ t0by joined15:23
← uranellus left15:23
→ sgambino joined15:24
→ modocache joined15:26
→ uranellus joined15:26
← uranellus left15:26
→ uranellus joined15:26
→ ytl joined15:26
← ytl left15:29
→ nettoweb joined15:30
→ sparetire joined15:31
← Kyle_j left15:32
→ artillero_jesd joined15:32
→ lindenle joined15:33
← justanotheruser left15:35
← fscala left15:35
← sgambino left15:35
→ sgambino joined15:36
← artillero_jesd left15:36
→ justanotheruser joined15:36
→ fscala joined15:37
→ Gloomy joined15:37
→ fbwnd joined15:37
→ rubyonrailed joined15:37
← jh3 left15:38
← tristanp_ left15:39
→ tristanp joined15:39
← rubyonrailed left15:42
← flughafen_ left15:42
← sgambino left15:44
→ fission6 joined15:44
← diegoaguilar left15:45
→ strayPuppy joined15:46
→ cmoneylulz joined15:47
→ sgambino joined15:50
← muld25 left15:51
→ artillero_jesd joined15:52
← cmoneylulz left15:52
← dopesong left15:52
← artillero_jesd left15:52
→ zivester joined15:52
→ liranp joined15:53
← liranp left15:54
← allgoodAtTaoti left15:56
→ flughafen_ joined15:56
→ renatosilva joined15:56
← subscope left15:57
← DrSlony left15:57
renatosilva any idea how we could implement this? https://github.com/Alexpux/MSYS2-packages/issues/44915:58
basically, the repository is not a single project but a collection of projects15:58
→ subscope joined15:58
→ vsanc joined15:59
renatosilva therefore a set of commits may have changed several packages, this is not like a single project where usually all but the latest commit from push can be ignored15:59
← morfin left16:00
← fbwnd left16:03
→ fedexo joined16:04
← sgambino left16:05
→ acetakwas joined16:05
→ sgambino joined16:06
→ Ahmed90 joined16:06
← dreiss left16:07
← fracting left16:08
← vsanc left16:08
→ jam__ joined16:08
← acetakwas left16:08
← fedexo left16:08
→ denisMone joined16:09
→ fedexo_ joined16:09
→ vsanc joined16:09
→ presto joined16:09
→ diegoaguilar joined16:10
→ moobee joined16:10
gitinfo set mode: +v16:10
→ elastix joined16:11
← jam__ left16:13
→ acetakwas joined16:13
← nnyk left16:14
→ Sucks joined16:14
→ rkazak joined16:14
→ nfk joined16:14
← deepy left16:15
← fedexo_ left16:15
→ deepy joined16:15
→ fedexo joined16:15
← Kulrak left16:16
← vsanc left16:16
→ DrSlony joined16:16
DrSlony hey, one more question16:16
→ yes`r joined16:16
DrSlony "git describe --tags" returns for example "4.2-700-g83776245". I need to get "4.2.700", periods everywhere, no hash. I can do this using sed, but can I get git to return that?16:17
← ysh left16:17
→ fedexo_ joined16:18
← Gloomy left16:18
← rkazak left16:18
→ ysh joined16:20
_ikke_ DrSlony: Don't you want git tag --contains?16:20
note that 700 means the number of commits since that tag16:20
→ vsanc joined16:20
← Juzzika left16:21
← fedexo left16:21
← vsanc left16:22
→ vsanc joined16:23
← intrigueD left16:23
DrSlony i'm updating a script which creates files needed for apple bundle generation which need to conform to apple bullshit requirements. In this case it must be x.y.z. Not being able to include the branch name is a problem, but not one I care about. Luckily our tags are already in the x.y format, so all I need to do is to get it to append "z" using a period to the tag name.16:23
← subscope left16:24
← Mmike left16:25
→ Mmike joined16:25
→ fastercat joined16:26
← sgambino left16:27
→ sgambino joined16:28
← dermoth left16:29
→ dreiss joined16:29
→ cmoneylulz joined16:29
→ nnyk joined16:29
→ Kulrak joined16:29
← Kulrak left16:29
→ Kulrak joined16:29
→ sq-one joined16:29
→ happy-dude joined16:31
_ikke_ You at least want --contains16:32
Because that commit is not part of 4.216:32
but 700 commits after 4.216:33
← acetakwas left16:33
→ ac3takwas joined16:33
→ acetakwas joined16:33
← moobee left16:34
← iota_pi left16:35
← aspiers left16:36
← nettoweb left16:37
← ryanar left16:37
← vsanc left16:37
→ rubyonrailed joined16:39
← kfunk left16:40
→ joufflu joined16:42
→ Balliad joined16:42
← Balliad left16:42
→ kfunk joined16:43
← rubyonrailed left16:44
→ aspiers joined16:44
← aspiers left16:44
→ vsanc joined16:44
← diogenese left16:46
← mizu_no_oto left16:46
→ Gloomy joined16:47
← acetakwas left16:49
← ac3takwas left16:50
← Werring left16:50
→ Werring joined16:50
← forrestv left16:51
← renatosilva left16:52
← leprechau left16:52
→ renatosilva joined16:53
→ cengizIO joined16:53
← renatosilva left16:54
→ forrestv joined16:54
← cagedwisdom left16:55
← nnyk left16:56
→ leprechau joined16:57
→ dermoth joined16:59
→ aspiers joined16:59
→ bddy joined16:59
bddy Hi. to look what a branch contains we can do git show somebranch:src/mycode.c is it possible to do the same for stash@{0} ?16:59
I get error "not a stash-like commit" when I do git stash show stash@{0}:src/mycode.c17:00
← cengizIO left17:00
bddy git show * fix17:00
oh sorry, got my error, I did git stash show instead17:00
→ intrigueD joined17:01
← cmoneylulz left17:02
→ InfoTest joined17:02
→ diegoviola joined17:03
← intellix left17:03
→ rubyonrailed joined17:04
→ GT4066 joined17:05
→ a_thakur joined17:05
→ cmoneylulz joined17:06
→ montana joined17:07
← sgambino left17:07
← cmoneylulz left17:07
← InfoTest left17:07
→ Balliad joined17:08
→ Wvifo joined17:08
← Wvifo left17:08
← PCatinean left17:09
← LeMike left17:10
→ sgambino joined17:10
← a_thakur left17:10
← dreiss left17:11
→ dreiss joined17:12
← jmpp left17:12
← Balliad left17:12
→ nwkj86 joined17:12
← pothepanda left17:13
→ nettoweb joined17:13
→ bitkiller joined17:13
← sgambino left17:14
→ sgambino joined17:14
gitinfo set mode: +v17:14
← HelloAtMega left17:15
→ nfk|laptop joined17:16
montana Hello All! :)17:16
gitinfo montana: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.17:16
→ squentin joined17:18
← ysh left17:18
montana I've got a question for you seasoned Git users out there. I'm in staging and I have something from develop that I want to bring over. Seems pretty easy. I checkout staging and then execute: git merge --no-ff feat-case-xxxx -- As soon as I do that the screen spits out not only my feat-case-xxxx but other developer commits from other branches. Where is the disconnect in my head? I would assume that my merge would only bring over my item.17:19
← beastd left17:19
→ Qir joined17:20
← Qir left17:20
← justanotheruser left17:20
sgen Its probably bringing over all the non merged commits on feat-case-xxxx17:21
→ Uma joined17:22
→ cmoneylulz joined17:22
← Uma left17:22
→ justanotheruser joined17:23
→ subscope joined17:24
← sq-one left17:26
→ intellix joined17:26
→ flavi0 joined17:26
← blackwind_123 left17:27
← presto left17:28
← dreiss left17:28
→ ndesh joined17:28
← cmoneylulz left17:29
→ PHPanos joined17:29
→ ajf- joined17:30
→ cagmz joined17:33
→ cagmz_ joined17:33
→ jam__ joined17:34
→ gancl joined17:35
→ rkazak joined17:35
← PHPanos left17:36
← cagmz_ left17:36
← mezod left17:36
→ scarabx joined17:38
montana *sgen* Is that an issue then? Is there a better way to bring my feat-case-xxxx over without the non-merged commits?17:38
← jottr left17:39
→ Balliad joined17:39
→ thiago joined17:40
← hardenedapple left17:40
→ mezod joined17:41
→ jottr joined17:41
← sgambino left17:43
→ hardenedapple joined17:43
BlessJah montana: when you merge branches, you merge branches - all changes that belongs to that branch (so yes, earlier changes done on feat-case-xxx even before feat-case-xxx was branched out)17:44
sgen That depends on whats in those commits. Which depends on your branching model. Youre probably better off asking someone in your organization who knows the specifics.17:44
BlessJah if you find it a problem, you may prefer to cherry-pick specific commits from feat-case-xxx17:44
← bddy left17:44
sgen ^ You can find where they diverge and merge only the commits wish17:45
→ sargas joined17:45
sgen But that can be dangerous if you dont know whats in them17:45
montana yeah, I was looking at cherry-pick and that looks like an option. I need to check that out tonight.17:45
→ jbitdrop joined17:46
sgen Just make sure you know what youre committing and especially what youre not committing17:46
→ ac3takwas joined17:46
→ acetakwas joined17:46
sgen If your branch has had hotfixes merged into it you wont want to exclude those in staging / production17:46
BlessJah montana: have a nice simulator for playing with merges, rebases and cherry-picks http://pcottle.github.io/learnGitBranching/?NODEMO17:47
→ lkirk joined17:47
montana My branch [feat-case-xxxx] is mine alone and based on the ticket I am working. No other devs would be in that branch. That's where the confusion came in when I merged it over to staging.17:47
← xaa left17:47
← rubyonrailed left17:48
→ clemf joined17:49
sgen Where did you branch it from? Devlop?17:49
Is your organization using something like this: http://nvie.com/posts/a-successful-git-branching-model/ ?17:49
→ sgambino joined17:50
montana Here's the flow that I follow at work: http://pastebin.com/8C6ik8JX17:51
← flughafen_ left17:51
← Renter left17:52
← fission6 left17:52
montana It's that last one "Merge feature into Staging" that I see this behavior.17:52
→ bollullera joined17:53
montana I wish I had my work laptop with me. :)17:53
→ bruce_lee joined17:54
→ dopesong joined17:54
← bruce_lee left17:54
→ bruce_lee joined17:54
→ saidi joined17:54
← saidi left17:54
→ saidi joined17:54
bremner montana: I'm not sure you understand merge. It merges the commit you specify, and all of the ancestors of that commit.17:55
← strozyka left17:55
montana What is considered and ancestor? All commits to develop from other devs?17:56
*BlessJah* Awesome simulator. Just saw your link. I'll check that out17:58
← acetakwas left17:58
← zeroed left17:58
← ac3takwas left17:59
← subscope left18:00
← nettoweb left18:01
← __builtin left18:04
→ FunkyAss joined18:05
bremner montana: git log staging..feat-case-xxx should give you the rough idea.18:05
→ morfin joined18:05
← vsanc left18:06
→ King_Hual joined18:06
← King_Hual left18:06
→ King_Hual joined18:06
montana Excellent! Thx bremner, BlessJah and sgen!!! Good to see responses. :)18:07
DrSlony thanks _ikke_18:07
← DrSlony left18:07
← FunkyAss left18:07
← Balliad left18:08
→ dreiss joined18:09
← basiclaser left18:09
→ yarnfive8 joined18:09
← gancl left18:09
← Gianormagantrous left18:10
sgen Montana: If youve already merged your feature into dev and are now merging dev into staging youre also merging everything everyone else has merged into dev.18:11
← joufflu left18:11
→ zeroed joined18:12
← Sleepy63 left18:12
montana *sgen* I'm only merging my feat-case-xxxx into staging.18:12
← Jackneill left18:12
← m0viefreak left18:12
← chris_wot left18:14
← zeroed left18:14
sgen You might want to talk to someone in your organization about your git workflow. Merging a feature branch into staging instead of into dev then merging dev into staging is a viable workflow, but thats not what your git workflow prescribes and it could cause issues18:14
nvm I misread that18:14
→ Gianormagantrous joined18:15
← Gianormagantrous left18:15
→ Gianormagantrous joined18:15
← Sucks left18:16
← montana left18:16
→ jagob joined18:17
→ Lyqyd joined18:17
→ Sucks joined18:17
→ __builtin joined18:17
→ flughafen_ joined18:18
→ guilherme joined18:19
→ doener joined18:20
← saidi left18:21
← Gitzilla left18:21
→ PHPanos joined18:22
→ jetpack__ joined18:24
→ xaa joined18:25
← modocache left18:26
← scarabx left18:26
→ kadoban joined18:26
← dopesong left18:26
→ GandalfTheWizard joined18:27
→ watabou joined18:27
← GandalfTheWizard left18:27
→ akushner joined18:27
← rkazak left18:27
← watabou left18:28
← yereby left18:28
→ GandalfTheWizard joined18:28
← hardenedapple left18:31
← doppo left18:31
→ doppo joined18:32
← freimatz left18:33
→ Timberwo|f joined18:34
← tildes left18:34
→ wefwed joined18:35
← akushner left18:36
→ tildes joined18:36
→ akushner joined18:36
→ cdg joined18:37
← jetpack__ left18:38
gitinfo set mode: +v18:39
wefwed In git v2.7.0, to operate on all files, commit uses -a, add uses -A, both use --all. Is this inconsistency on purpose? Or is it a UX bug?18:39
→ rkazak joined18:41
← eka left18:41
→ Hell-Razor joined18:42
← sargas left18:43
→ diogenese joined18:43
← nd left18:43
→ bronson joined18:44
→ nd joined18:45
→ fission6 joined18:45
← glebihan left18:46
← bronson left18:49
← denisMone left18:50
→ glebihan joined18:52
← dreiss left18:54
← githogori left18:54
← ErKa left18:54
→ trewe joined18:56
← i_ron left18:57
b_jonas wefwed: git commit -a doesn't operate on all files, it operates on the files that are currently in the index, and gets their latest version from the checked out files. it's analogous to git add -u actually. git add -A acts on both files already in the index and ones not yet in the index.18:57
→ i_ron joined18:57
b_jonas wefwed: perhaps they shouldn't both be called --all18:57
← Puffball left19:00
← cdg left19:02
→ dopesong joined19:02
→ dreiss joined19:03
→ mizu_no_oto joined19:05
→ githogori joined19:07
← nwkj86 left19:07
← dopesong left19:08
→ boombatower joined19:08
← tristanp left19:09
→ bronson joined19:09
→ tristanp joined19:09
→ muld25 joined19:11
→ sargas joined19:11
→ modocache joined19:12
← muld25 left19:12
→ muld25 joined19:12
→ postsneakernet joined19:14
← dreiss left19:15
← strayPuppy left19:15
→ cdg joined19:15
← modocache left19:16
→ Cassiopaya joined19:20
→ Discovery joined19:20
← intrigueD left19:20
← jbitdrop left19:20
→ nwkj86 joined19:21
→ Borkr joined19:23
→ Ulft joined19:24
← Ulft left19:24
← tildes left19:25
→ Kspco joined19:27
← Kspco left19:28
← jagob left19:28
→ cfoch joined19:29
cfoch hi19:29
Hi. How do I cherry-pick for only certain files?19:29
→ armin joined19:30
→ Guest27 joined19:30
← Khisanth left19:31
→ HelloAtMega joined19:31
→ BeerBuddy joined19:32
← perrier_ left19:32
← BeerBuddy left19:32
→ ocbtec joined19:33
← ocbtec left19:33
→ BeerBuddy joined19:33
→ ocbtec joined19:34
← BeerBuddy left19:34
→ BeerBuddy joined19:34
← BeerBuddy left19:34
→ BeerBuddy joined19:35
← BeerBuddy left19:35
→ BeerBuddy joined19:36
Seveas cfoch: you don't.19:36
← BeerBuddy left19:36
Seveas but you can amend the cherry-picked commit, undoing the unwanted changes19:36
→ BeerBuddy joined19:37
← BeerBuddy left19:37
← clemf left19:37
→ xelxebar joined19:37
Seveas wefwed: unfortunately, UI consistency is not one of Git's things :)19:38
→ SimonNa joined19:38
→ BeerBuddy joined19:38
← muld25 left19:38
← Sucks left19:38
← BeerBuddy left19:38
→ BeerBuddy joined19:39
← BeerBuddy left19:39
→ Sucks joined19:40
→ BeerBuddy joined19:40
← BeerBuddy left19:40
→ Kang0 joined19:41
→ BeerBuddy joined19:41
← sanketdg left19:41
← BeerBuddy left19:41
→ BeerBuddy joined19:42
→ dopesong joined19:42
← BeerBuddy left19:43
→ BeerBuddy joined19:43
← BeerBuddy left19:44
→ duderono_ joined19:44
→ modocache joined19:44
→ cengizIO joined19:44
→ BeerBuddy joined19:44
← BeerBuddy left19:45
→ BeerBuddy joined19:45
← trewe left19:46
← BeerBuddy left19:46
→ eka joined19:46
→ BeerBuddy joined19:46
← BeerBuddy left19:47
→ trewe joined19:47
→ cmoneylulz joined19:47
→ Domhack joined19:47
→ BeerBuddy joined19:47
← BeerBuddy left19:48
→ BeerBuddy joined19:48
← BeerBuddy left19:48
→ BeerBuddy joined19:49
← BeerBuddy left19:49
→ BeerBuddy joined19:50
← BeerBuddy left19:50
→ BeerBuddy joined19:51
← BeerBuddy left19:51
→ BeerBuddy joined19:52
→ mwhooker joined19:52
← trewe left19:52
← JanC left19:52
← BeerBuddy left19:52
→ BeerBuddy joined19:53
← BeerBuddy left19:53
→ rubyonrailed joined19:54
→ BeerBuddy joined19:54
← BeerBuddy left19:54
→ BeerBuddy joined19:55
← BeerBuddy left19:55
← rubyonrailed left19:56
← dopesong left19:56
→ dopesong joined19:57
→ BeerBuddy joined19:57
cfoch what should I do here19:57
http://fpaste.org/326693/59982571/19:57
← BeerBuddy left19:58
→ BeerBuddy joined19:58
← BeerBuddy left19:58
→ Khisanth joined19:59
→ BeerBuddy joined19:59
← BeerBuddy left19:59
→ BeerBuddy joined20:00
→ freimatz joined20:00
← BeerBuddy left20:01
→ BeerBuddy joined20:01
← BeerBuddy left20:02
→ BeerBuddy joined20:02
← mwhooker left20:02
← BeerBuddy left20:02
→ sbasso joined20:03
→ BeerBuddy joined20:03
← BeerBuddy left20:03
→ gechr joined20:04
← fission6 left20:04
← sargas left20:04
→ BeerBuddy joined20:04
← BeerBuddy left20:04
← freimatz left20:05
→ BeerBuddy joined20:05
← BeerBuddy left20:05
→ JanC joined20:06
→ felixn joined20:06
← shinnya left20:06
→ BeerBuddy joined20:06
diegoviola → dviola20:06
← BeerBuddy left20:07
→ UbuntuDude joined20:07
→ BeerBuddy joined20:07
← jottr left20:07
UbuntuDude do I need to understand linux diff before I'm able to try to understand git diff changes? how the two are related to each other?20:08
→ jmpp joined20:09
← jetpack_joe left20:09
grawity `git diff` uses almost the same format as `diff -U` (unified diff)20:09
qsx grawity: -U? -u?20:10
← Sucks left20:10
grawity ah yes, -u20:10
well both really.20:10
→ EricPoe joined20:10
qsx TIL20:10
kadoban cfoch: It kind of tells you what to do, no?20:11
→ Sucks joined20:11
← jmpp left20:13
← EricPoe left20:16
← averagedan_ left20:16
← thiago left20:16
→ joufflu joined20:17
→ muld25 joined20:17
← ocbtec left20:18
→ nettoweb joined20:19
← dopesong left20:19
→ thiago joined20:20
← Sucks left20:21
← diegoaguilar left20:21
← CheckDavid left20:21
→ Sucks joined20:21
← joufflu left20:22
← xanadu left20:24
hfp Hi, There is a commit I'd like to be able to refer to on GitHub because it relates to a bug. So I make a `wip` commit and create a new branch off that commit that I can refer to in the issue ticket. I then go back to my previous branch. I do further work and squash my commits into one. Will that destroy the commit that is on the issue branch or will it stay there independently of what happens on my devleopment br20:26
anch?20:26
→ ErKa joined20:26
← cengizIO left20:29
← tgunr left20:30
← s9 left20:31
← lkirk left20:33
← wefwed left20:33
← gechr left20:33
← eka left20:33
→ averagedan_ joined20:35
→ dopesong joined20:35
→ diegoaguilar joined20:36
→ ysh joined20:36
→ BeerLover joined20:37
→ mohabaks joined20:37
← dopesong left20:38
← phaleth left20:38
Eugene hfp - commits are rarely-never destroyed, only no-longer-referenced.20:38
← BeerBuddy left20:38
Eugene hfp - changes made to one branch will not affect other branches in any way; you may end up with duplicate commits with rebase/squash however.20:39
← mattp__ left20:39
→ eka joined20:39
Eugene To answer your question, the issue branch will stay put while the development branch moves forward20:39
← cmoneylulz left20:40
→ aidalgol joined20:42
← guilherme left20:42
← aidalgol left20:42
→ aidalgol joined20:43
← modocache left20:43
→ modocache joined20:44
→ EricPoe joined20:45
→ dopesong joined20:45
→ skylite joined20:45
← saidelike left20:46
→ OverCoder joined20:46
← skylite left20:46
← muld25 left20:47
OverCoder Um, how do I set default push target, but for a different branch? when I do: git push --set-upstream https://github.com/MicroDroid/blueirc.git master, it works, but if I do git push --set-upstream https://github.com/MicroDroid/blueirc.git mybranch, I get some errors20:47
→ intrigueD joined20:47
OverCoder error: src refspec canary does not match any.20:48
→ cengizIO joined20:48
← dopesong left20:49
← rvsjoen left20:49
→ rvsjoen joined20:50
→ saidelike joined20:51
→ astrozyk joined20:53
→ fission6 joined20:54
← cengizIO left20:55
← toothe left20:57
→ yqt joined20:57
→ cengizIO joined20:58
← mohabaks left20:59
← mizu_no_oto left21:00
← fedexo_ left21:00
→ cmoneylulz joined21:02
→ livingstn joined21:02
← EricPoe left21:02
→ anchorite joined21:03
→ Gitzilla joined21:05
← ajf- left21:05
thiago OverCoder: git config push.default upstream21:07
OverCoder hm21:07
I'll try it in a moment21:08
← felixn left21:08
→ qqz joined21:08
→ shinnya joined21:09
← qqz left21:11
← BeerLover left21:11
→ Rodya_ joined21:13
→ xocolatl joined21:16
→ muld25 joined21:17
← fission6 left21:17
← Rodya_ left21:17
xocolatl hi, I'm looking for a way to import git commit metadata into an sql database, but google is only telling me how to store mysql in git which is NOT what I want. ideas?21:17
moritz write a script that does the import?21:18
xocolatl sure. what git commands do I need to extract the data?21:18
sql is my day job, git is not21:18
← rkazak left21:19
→ dreiss joined21:19
moritz what meta data do you want?21:19
← dsdeiz left21:19
moritz in general, git log with custom formatting options (see the man page) would be a good start21:20
xocolatl sha, committer, commit message, date, all that21:20
→ rkazak joined21:20
moritz yes, git log will give you all that21:20
← nwkj86 left21:21
→ cdg_ joined21:21
→ nwkj86 joined21:22
→ Levitator joined21:22
← cdg left21:23
dviola how do I wipe my latest commit?21:23
I didn't push or anything21:23
→ dopesong joined21:23
hfp Eugene: thanks21:24
moritz dviola: git reset --hard HEAD^; # the notes from !backup apply21:25
gitinfo dviola: Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups21:25
→ preyalone joined21:26
→ EricPoe joined21:26
← sbasso left21:28
kugel_ → kugel21:29
← ToxicFrog left21:29
← livingstn left21:29
→ livingstn joined21:31
→ wh3ko19 joined21:33
→ sbasso joined21:34
→ Yeltsin joined21:34
← suffice left21:36
← Sucks left21:40
← flughafen_ left21:40
→ Sucks joined21:41
← dreiss left21:41
→ flughafen_ joined21:43
← Yeltsin left21:44
← Kicer86 left21:44
← HelloAtMega left21:45
_d3x0r → d3x0r21:45
← ErKa left21:45
← tristanp left21:46
← EricPoe left21:46
→ tristanp joined21:47
← cagmz left21:47
→ ac3takwas joined21:48
→ Mateo_W joined21:48
→ dsdeiz joined21:49
← fastercat left21:49
→ acetakwas joined21:49
pampeho → ecfx21:51
← nfk left21:51
← tristanp left21:51
← ndesh left21:52
← anchorite left21:52
→ freimatz joined21:54
← nettoweb left21:54
ecfx → pampeho21:55
→ nfk joined21:55
← sbasso left21:55
→ ToxicFrog joined21:55
→ EricPoe joined21:56
→ Rodya_ joined21:57
← acetakwas left21:58
← ac3takwas left21:59
← pantsman_ left22:02
→ EricPoe_ joined22:02
← EricPoe left22:03
← freimatz left22:03
← monkeyisl left22:03
← UbuntuDude left22:04
→ jottr joined22:04
→ UbuntuDude joined22:06
→ floatingpoint joined22:06
← EricPoe_ left22:07
→ daito joined22:12
← Sucks left22:12
← ysh left22:12
→ Sucks joined22:14
← elastix left22:15
→ HelloAtMega joined22:15
← LucaTM left22:16
← pfloyd left22:17
← daito left22:17
→ ajf- joined22:17
← cfoch left22:19
→ ErKa joined22:21
→ cagedwisdom joined22:21
→ markmarkmark joined22:22
→ Treio joined22:23
→ meLon joined22:23
← wh3ko19 left22:25
→ Tortoise1 joined22:26
→ blackwind_123 joined22:26
← Tortoise left22:26
← GandalfTheWizard left22:27
← muld25 left22:28
→ GandalfTheWizard joined22:28
← GandalfTheWizard left22:28
→ GandalfTheWizard joined22:29
← GandalfTheWizard left22:29
← Borkr left22:30
→ GandalfTheWizard joined22:30
→ tristanp joined22:30
← GandalfTheWizard left22:30
→ GandalfTheWizard joined22:31
← cdg_ left22:31
← GandalfTheWizard left22:31
→ GandalfTheWizard joined22:32
← GandalfTheWizard left22:32
→ cfoch joined22:32
← eka left22:32
→ GandalfTheWizard joined22:33
← GandalfTheWizard left22:33
→ Atm0spher1c joined22:35
← nightfuri left22:37
→ EricPoe joined22:37
→ jagob joined22:37
← EricPoe left22:38
← cfoch left22:40
← PHPanos left22:40
← markmarkmark left22:40
→ markmarkmark joined22:41
→ nettoweb joined22:41
→ mehola joined22:41
← ajf- left22:41
← jagob left22:42
← tristanp left22:43
→ joufflu joined22:45
→ muld25 joined22:47
→ ajf- joined22:49
← moei left22:51
→ elastix joined22:51
→ cfoch joined22:52
← elastix left22:53
→ moei joined22:54
→ nachoman joined22:57
→ Borkr joined22:59
→ chris_wot joined23:00
← nidr0x left23:00
← cmoneylulz left23:00
← yes`r left23:03
← githogori left23:04
← cengizIO left23:04
→ strayPuppy joined23:05
→ elastix joined23:06
← ajf- left23:06
← muld25 left23:07
→ watabou joined23:07
→ CheckDavid joined23:07
← elastix left23:09
← nfk left23:10
→ Kyle_j joined23:11
← Kyle_j left23:11
→ hahuang61 joined23:15
← hahuang65 left23:15
→ elastix joined23:17
→ mizu_no_oto joined23:20
→ eka joined23:23
→ tgunr joined23:24
→ Jusle joined23:25
→ muld25 joined23:26
→ _z joined23:27
← floatingpoint left23:28
→ floatingpoint joined23:30
← Atm0spher1c left23:30
← diegoaguilar left23:31
→ scarabx joined23:32
← intrigueD left23:32
→ raininja joined23:33
← floatingpoint left23:33
← rkazak left23:33
← raijin left23:33
→ jagob joined23:36
← Sucks left23:36
→ paul424 joined23:36
→ githogori joined23:37
← TomyLobo left23:37
→ Sucks joined23:37
← JanC left23:38
→ floatingpoint joined23:40
→ nidr0x joined23:41
→ cmoneylulz joined23:41
← blackwind_123 left23:41
← floatingpoint left23:42
← yqt left23:43
← livingstn left23:44
← toogley left23:44
→ yqt joined23:46
← _rgn left23:47
← GT4066 left23:48
→ _rgn joined23:49
← _rgn left23:49
→ _rgn joined23:49
→ nevodka joined23:50
→ JanC joined23:51
→ diegoaguilar joined23:54
← raininja left23:54
← fscala left23:57
→ fscala joined23:58

Logs Search ←Prev date Next date→ Channels Documentation