IRCloggy #git 2017-03-31

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.

2017-03-31

← de-facto left00:01
→ Gsham joined00:01
→ de-facto joined00:01
← gunnaro left00:01
← Fallen0223 left00:01
→ gunnaro joined00:01
← cyberz left00:04
← dreiss left00:05
→ cyberz joined00:06
→ matoro joined00:13
→ rk joined00:13
← druonysus left00:15
← orbyt_ left00:15
← gunnaro left00:16
→ gunnaro joined00:16
← gunnaro_ left00:18
← gunnaro left00:18
→ nevodka joined00:18
→ gunnaro joined00:18
→ rsripada joined00:18
← rsripada left00:18
← rk left00:18
→ rk joined00:19
← m0viefreak left00:21
→ mehola joined00:22
→ thebope joined00:24
← mattcen left00:26
← mehola left00:26
← netj left00:27
→ rnsanchez joined00:27
← Sasazuka_ left00:27
→ netj joined00:28
→ Sasazuka joined00:28
← thebope left00:28
← ispn left00:29
← steeze left00:32
→ chipotle_ joined00:33
→ mattcen joined00:33
→ bocaneri joined00:35
← chipotle left00:36
← drodger left00:36
← cyberz left00:38
← Guest80652 left00:38
← al-damiri left00:38
← j08nY left00:40
→ cyberz joined00:40
→ ToBeCloud joined00:40
gitinfo set mode: +v00:41
← gunnaro left00:41
b0nn cjohnson: yes, different branch, but I had checked the different branch out and there's nothing to pull00:41
ToBeCloud → Guest9331500:41
b0nn apologies for the delay in responding, got dragged into a meeting :(00:41
→ Nicmavr joined00:41
→ drodger joined00:41
→ gunnaro joined00:41
Nicmavr → Guest3721100:42
← Guest93315 left00:44
← ToBeFree left00:44
→ ToBeFree joined00:44
gitinfo set mode: +v00:44
← wizardedit left00:45
← AstralStorm left00:46
← holodoc left00:47
← gunnaro left00:48
→ SoulOfTheInterne joined00:49
→ holodoc joined00:49
→ AstralStorm joined00:51
← nitric left00:51
← dsdeiz left00:51
→ Rodya_ joined00:52
← Cabanossi left00:54
→ rchavik joined00:54
→ Cabanossi joined00:56
← pickfire left00:56
← Rodya_ left00:59
← cheesegits left00:59
← netj left01:00
→ chigang joined01:00
← pinkkis left01:00
→ netj joined01:00
→ steeze joined01:00
→ dan_ joined01:01
← danboid left01:01
→ roelmonnens joined01:01
dan_ → Guest3172501:01
b0nn cjohnson: Ignore all that, I've fixed it :)01:03
→ durham_ joined01:03
← durham_ left01:03
→ durham_ joined01:04
→ cheesegits joined01:04
→ jimi_ joined01:04
→ ronin_work joined01:05
→ orbyt_ joined01:05
← durham left01:05
→ Sasazuka_ joined01:06
← roelmonnens left01:06
← zerocua left01:07
→ theiostream joined01:08
← durham_ left01:08
← Sasazuka left01:09
→ zerocua joined01:10
→ nd- joined01:12
→ webdev007 joined01:13
← nd left01:15
→ dsdeiz joined01:15
← holodoc left01:17
→ holodoc joined01:17
→ thebope joined01:18
← jimklo left01:21
← tyreld left01:22
← thebope left01:22
← Silenced_v2 left01:23
→ jtoy joined01:24
→ gunnaro joined01:24
← shgysk8zer0 left01:25
→ Wulf4 joined01:25
← Wulf4 left01:25
→ Wulf4 joined01:25
→ fstd_ joined01:28
← fstd left01:28
← pedahzur left01:28
fstd_ → fstd01:28
→ finalbeta joined01:29
← Wulf left01:29
Wulf4 → Wulf01:29
→ kyan joined01:32
→ dan__ joined01:33
← Guest31725 left01:34
← Sasazuka_ left01:35
← davidfetter_ge left01:35
→ ozmage joined01:36
→ Grievre joined01:36
Grievre Is there a shorter way to accomplish the same thing as this: https://hastebin.com/raw/cesazaluyi01:36
I usually just do rebase -i but this sequence of commands I've found to be less prone to giving up due to changes in the master branch01:37
← ronin_work left01:38
← lavalamp left01:40
← mikecmpbll left01:41
← sunri5e left01:42
→ sunri5e joined01:43
← ilbot3 left01:45
→ ilbot3 joined01:48
← jtoy left01:48
← dsdeiz left01:49
← faLUCE left01:52
→ dsdeiz joined01:52
← dsdeiz left01:52
→ dsdeiz joined01:52
→ faLUCE joined01:52
← shgysk8zer0_ left01:54
thiago Grievre: I can't think of a shorter way.01:54
Grievre: but I wouldn't use squash merges at all01:54
→ durham joined01:54
polyzen → nacho01:54
→ lavalamp joined01:55
→ Rodya_ joined01:55
← svm_invictvs left01:57
← dan__ left01:57
← d^sh left01:58
→ maroloccio joined01:58
← dsdeiz left01:59
→ d^sh joined01:59
→ danboid joined01:59
← Rodya_ left02:00
← dermoth left02:00
→ dermoth joined02:00
← raspado left02:01
← nowhere_man left02:02
← cyberz left02:03
→ dreiss joined02:03
← matoro left02:06
← jokajak left02:06
→ cyberz joined02:06
→ juvenal joined02:07
→ jeffreylevesque joined02:08
← holodoc left02:10
← Cabanossi left02:10
→ jameser joined02:11
→ Cabanossi joined02:11
→ thebope joined02:12
→ holodoc joined02:12
← thebope left02:12
→ thebope joined02:12
→ pionen joined02:13
← cyberz left02:15
→ cyberz joined02:17
← hexagoxel left02:19
← King_Hual left02:19
→ lagothrix joined02:19
→ King_Hual joined02:19
← King_Hual left02:19
→ King_Hual joined02:19
← danboid left02:19
→ danboid joined02:19
← Atm0sphe1 left02:20
← luke_nukem left02:20
→ matoro joined02:20
← durham left02:20
→ Atm0spher1c joined02:20
← thebope left02:20
→ hashtagstrashtag joined02:21
→ shgysk8zer0_ joined02:22
← lagothri1 left02:22
→ dtbn joined02:22
→ mehola joined02:22
→ peeps[lappy] joined02:23
← gunnaro left02:23
→ hexagoxel joined02:25
→ Chinggis6 joined02:25
← Gsham left02:26
← holodoc left02:26
← dtbn left02:26
← jimi_ left02:26
→ Rodya_ joined02:26
← mehola left02:26
→ holodoc joined02:28
← kbs left02:29
→ kbs joined02:29
← ozmage left02:30
← bitmod_ left02:30
← cyberz left02:32
← holodoc left02:33
← Jan2 left02:33
→ cyberz joined02:34
← regedit left02:34
→ ronin_work joined02:35
→ holodoc joined02:35
→ dsdeiz joined02:37
→ dtbn joined02:38
← Nugget left02:39
← juvenal left02:39
→ CmndrSp0ck joined02:39
→ Emperor_Earth joined02:39
← cyberz left02:40
→ cyberz joined02:42
← dtbn left02:42
← howdoi left02:43
← lb1c left02:44
← dsdeiz left02:44
→ lb1c joined02:44
→ dtbn joined02:47
← Gustavo6046 left02:50
← matoro left02:50
← ToBeFree left02:51
← dtbn left02:52
→ Vortex34 joined02:54
← HoierM left02:56
← Vortex35 left02:57
→ snowkidind joined02:58
← ojdo left02:59
← chachasmooth left02:59
← Rodya_ left03:01
← dreiss left03:01
← rchavik left03:02
← holodoc left03:03
← de-facto left03:03
← Noldorin left03:03
← chardan left03:04
→ chachasmooth joined03:04
← raynold left03:04
← cyberz left03:04
← alexandre9099 left03:05
→ de-facto joined03:05
← kaldoran left03:06
→ ojdo joined03:06
→ alexandre9099 joined03:06
← sim590 left03:06
→ cyberz joined03:06
→ holodoc joined03:08
→ sim590 joined03:08
← hvxgr left03:08
→ kaldoran joined03:09
← ronin_work left03:09
→ ozmage joined03:10
← s2013 left03:10
→ gunnaro joined03:11
← maroloccio left03:14
← cyberz left03:14
→ cqi joined03:14
← marianina8 left03:14
→ rchavik joined03:15
← webdev007 left03:15
→ matoro joined03:15
← holodoc left03:15
→ cyberz joined03:15
← shgysk8zer0_ left03:16
→ holodoc joined03:17
→ jokajak joined03:19
→ Andrew_K joined03:19
→ svm_invictvs joined03:20
→ ayogi joined03:20
← sunri5e left03:20
→ aavrug joined03:21
← scoobert1on left03:21
→ scoobertron joined03:22
← aavrug left03:22
→ sunri5e joined03:22
→ aavrug joined03:22
← aavrug left03:23
→ aavrug joined03:23
→ TbobbyZ joined03:23
→ marianina8 joined03:24
← kbs left03:24
→ menip joined03:24
← ayogi left03:25
← svm_invictvs left03:26
← akkad left03:26
← snowkidind left03:26
→ ayogi joined03:27
← TbobbyZ left03:28
→ dreiss joined03:28
← marianina8 left03:28
← ozmage left03:29
← Garen left03:33
→ Eragon joined03:33
→ Garen joined03:33
← Eragon left03:34
→ Eragon joined03:34
← aidalgol left03:34
← Eragon left03:34
→ Eragon joined03:34
← chipotle_ left03:35
→ akkad joined03:36
← matoro left03:37
→ matoro joined03:39
→ dnukem joined03:39
→ Joufflu joined03:40
Joufflu noob here...question how do I replace my local files with those in my git repository ? I tried "git pull" but that didn't work03:40
← drodger left03:41
Joufflu i also found "git stash" but not 100% what it will actually do and reading the documentation isn't helping me03:41
→ hvxgr joined03:42
→ drodger joined03:42
kadoban Joufflu: Your local files typically are in a git repository, so it's unclear what you mean.03:43
Joufflu i've made changes in my editor and have not done a git push origin master03:44
so my files in my repo have not changed03:45
→ maroloccio joined03:45
Joufflu i want those files in my repo replace my current local files03:45
i'm working with a local ruby rails server (on vagrant) and usually i play around with the code as I make changes to my site but right now I did something and for some reason I can't get rid of this error03:46
so I just want to revert back to what is currently in my repo03:46
← Joufflu left03:48
→ deepwater joined03:48
← robattila256 left03:49
→ dsdeiz joined03:49
→ sbulage joined03:49
← cyberz left03:50
→ sz0 joined03:50
→ cyberz joined03:51
← Cabanossi left03:53
← orbyt_ left03:54
→ ISmithers joined03:54
→ mizu_no_oto joined03:54
← sbulage left03:55
← ISmithers left03:55
→ Cabanossi joined03:56
→ snowalpaca joined03:57
→ Nugget joined03:57
→ mehola joined03:58
← cyberz left03:58
→ cyberz joined04:00
← ayogi left04:01
→ raspado joined04:01
→ Rodya_ joined04:02
← mizu_no_oto left04:04
→ xall joined04:06
← raspado left04:06
→ a_thakur joined04:07
→ ronin_work joined04:07
← a_thakur left04:07
→ a_thakur joined04:07
← Rodya_ left04:08
← cyberz left04:15
→ Goplat joined04:17
← kadoban left04:21
→ cyberz joined04:22
→ robotroll joined04:24
→ MutantMahesh joined04:24
← bdonnahue left04:27
→ kbeflo joined04:27
→ miczac joined04:27
gitinfo set mode: +v04:28
← cyberz left04:30
→ cyberz joined04:32
→ reznord joined04:34
← King_Hual left04:34
→ ayogi joined04:35
← Eryn_1983_FL left04:35
→ sbulage joined04:36
← cyberz left04:37
→ cyberz joined04:37
← cheesegits left04:39
← ronin_work left04:40
← MutantMahesh left04:45
← cyberz left04:46
→ nckpz joined04:48
→ cyberz joined04:49
→ Eryn_1983_FL joined04:49
saul is there a way to limit permissions on part of the repository so i can prevent users from gaining access to the entire source04:53
i'm operating in a high-risk environment in terms of people taking code out of the company04:54
← storrgie left04:54
← enckse left04:54
_ikke_ No04:55
Not when you want people to be able to clone the repository04:55
saul yeah didnt think so ;/04:55
→ robattila256 joined04:56
saul i wonder how proprietary software shops handle this04:56
i doubt a windows operating system developer can clone and get the complete source for windows :D04:56
→ svm_invictvs joined04:56
← cyberz left04:57
reznord saul: well, that is the reason they have private repositories :P04:57
→ enckse joined04:58
→ cyberz joined04:58
saul reznord: i'm not sure what you mean by private ... our repo requires a password, it's not a free public github repo for example04:58
but the password lets you clone it all :D04:59
→ storrgie joined04:59
saul i'm imagining something similar to file permissions in unix04:59
and having ownership of files or directories per git user04:59
another idea i had was, for example if you're working on something that uses MVC architecture, the Model and Controller code are on a server, and the guy working on views can edit files and upload them and test05:00
but only the view file he's working on, or something05:00
now i'm just rambling, sorry :)05:00
→ rscata joined05:00
→ dtbn joined05:02
← steeze left05:02
← Doginal left05:03
→ Wulf4 joined05:03
_ikke_ saul: I suppose they are not working with one big repository05:04
But divided it up into multiple projects05:04
→ Rodya_ joined05:04
saul _ikke_: that was another thing i was considering05:05
→ dec0n joined05:05
saul (just doing multiple repos)05:06
← Wulf left05:06
Wulf4 → Wulf05:06
← dtbn left05:07
← Eryn_1983_FL left05:09
← Rodya_ left05:09
← holodoc left05:11
← dsdeiz left05:11
→ holodoc joined05:13
→ karols146 joined05:14
← sbulage left05:14
→ MutantMahesh joined05:14
→ dsdeiz joined05:14
← oleo left05:15
← dec0n left05:15
→ dec0n joined05:15
→ dtbn joined05:18
→ ogny joined05:20
→ Eryn_1983_FL joined05:22
→ aidalgol joined05:22
← dtbn left05:23
← holodoc left05:23
→ holodoc joined05:24
← karols146 left05:24
→ TbobbyZ joined05:26
→ Brski joined05:26
→ spb joined05:30
← TikityTik left05:30
← Eryn_1983_FL left05:30
← TbobbyZ left05:31
→ dtbn joined05:33
→ overlord_tm joined05:37
← dtbn left05:38
→ Raging_Hog joined05:39
→ chardan joined05:39
← oskarkv left05:40
← nckpz left05:40
← theiostream left05:41
← cqi left05:43
← Chinggis6 left05:44
→ ronin_work joined05:44
← dave0x6d left05:45
→ dendazen joined05:45
→ dtbn joined05:49
← lavalamp left05:49
← dreiss left05:49
→ lordjancso joined05:50
→ Eryn_1983_FL joined05:52
→ Paixo joined05:53
← dtbn left05:53
← mda1 left05:53
→ mda1 joined05:54
← AstralStorm left05:55
← Paixo left05:55
← diogenese left05:56
← safe left05:56
← dendazen left05:59
→ Paixo joined06:00
← Paixo left06:00
→ diogenese joined06:01
→ AstralStorm joined06:01
→ Paixo joined06:03
← pionen left06:03
← Paixo left06:03
bocaneri → Bock06:04
Bock → Boc06:04
→ Rodya_ joined06:05
← chardan left06:05
visual morning fellow gits06:06
← miczac left06:08
← Rodya_ left06:09
→ dtbn joined06:10
→ imack joined06:11
← xanadu_ left06:11
→ Paixo joined06:12
← Paixo left06:12
← dnukem left06:13
→ mar77i joined06:13
→ inflames joined06:14
← a_thakur left06:14
← dtbn left06:15
→ Paixo joined06:15
← Paixo left06:15
→ luke_nukem joined06:16
→ Paixo joined06:16
← Paixo left06:16
→ Paixo joined06:17
← Paixo left06:17
→ Paixo joined06:17
← Paixo left06:17
→ Paixo joined06:18
← Paixo left06:18
→ roelmonnens joined06:19
→ Silmarilion joined06:19
← dsdeiz left06:20
→ dsdeiz joined06:20
← roelmonnens left06:20
→ roelmonnens joined06:20
← alcohol left06:22
→ zeroed joined06:22
→ alcohol joined06:23
→ jnavila joined06:23
→ chele joined06:24
← CmndrSp0ck left06:25
→ aruns joined06:27
← faLUCE left06:28
→ MineCoins joined06:28
→ faLUCE joined06:28
→ Taikibansei joined06:29
← Taikibansei left06:30
→ dtbn joined06:31
← Ratler_ left06:32
← faLUCE left06:32
→ faLUCE joined06:33
← rvgate left06:34
← metachr0n left06:34
← drodger left06:34
→ metachr0n joined06:35
→ Ratler joined06:36
← dtbn left06:36
← faLUCE left06:38
→ dreiss joined06:38
← menip left06:38
← dvaske_ left06:39
→ faLUCE joined06:40
→ JeroenT joined06:40
← Cabanossi left06:40
→ drodger joined06:40
← mehola left06:40
→ Cabanossi joined06:41
→ mehola joined06:41
← mt left06:41
→ jtoy joined06:45
← mehola left06:45
→ roelmonn_ joined06:45
← PaulCape_ left06:46
← mar77i left06:47
→ dtbn joined06:47
→ mar77i joined06:47
→ eroux joined06:48
← roelmonnens left06:48
→ jagob joined06:49
← jtoy left06:49
→ PaulCapestany joined06:49
← holodoc left06:50
→ mehola joined06:50
→ a_thakur joined06:50
← a_thakur left06:51
→ holodoc joined06:51
→ a_thakur joined06:51
← dtbn left06:51
← danboid left06:53
← thiago left06:53
→ danboid joined06:53
→ vrach joined06:54
→ ShapeShifter499 joined06:56
→ manuelschneid3r joined07:01
→ cqi joined07:02
→ dtbn joined07:03
→ zulutango joined07:03
← danboid left07:03
→ kegster joined07:06
← Vortex34 left07:06
→ pinkkis joined07:07
→ rokups joined07:07
→ netroxen joined07:07
→ chipotle joined07:07
← dtbn left07:08
← JeroenT left07:08
→ JeroenT joined07:08
← Cabanossi left07:09
→ chardan joined07:10
→ Cabanossi joined07:11
← dreiss left07:11
reznord → Anupkumar07:12
Anupkumar → reznord07:12
← matoro left07:13
← a_thakur left07:14
→ matoro joined07:14
→ MutantMa_ joined07:15
→ elect_ joined07:16
← cyberz left07:19
← MutantMahesh left07:19
← Calinou left07:19
→ cyberz joined07:20
→ sea-gull joined07:20
→ gtristan joined07:21
→ Calinou joined07:24
→ amrits joined07:24
← sz0 left07:24
→ sotoz joined07:25
→ alesan joined07:25
alesan hello07:25
← Andrew_K left07:25
alesan when in a git log I see one commit with message like "Merge branch 'develop' of https://......... into develop"07:26
(develop is a branch in this git)07:26
→ weualo joined07:26
alesan is that specific commit, with hash 6a5bf35317390c62191b7382bc1d65e3a5f353d8, just a place holder of some sorts? If I do a git show it does not show anything07:27
git show 6a5bf35317390c62191b7382bc1d65e3a5f353d8 I mean07:27
jast it's a merge commit07:27
basically it tells Git that two independent lines of development have been joined (git log -g to see the structure)07:27
sorry, that's git log --graph07:27
alesan so where would I see the changes?07:28
oh let me try that07:28
→ TbobbyZ joined07:28
→ schleppel joined07:28
jast well, merges have not just one, but two parents, so *by default* the changes aren't shown since Git doesn't know which parent you want to compare to07:28
← madewokherd left07:28
jast you can use '-m' to have the commit listed multiple times: once for each parent, with a diff relative to that parent07:28
alesan I am not sure I'm still following you... let me make it simpler07:29
the commit *before* this special merge commit is ...5f729507:29
← imack left07:29
← Nilesh_ left07:30
jast chronologically, perhaps.. but think of it as a structure07:30
→ imack joined07:30
jast each normal commit has a "parent commit" (the commit that preceded it)07:30
alesan yes07:30
jast with a merge commit, there are *two* parent. one is probably that commit you mentioned (5f7295), the other is from the other side of the merge07:30
Boc → Bock07:31
alesan OK07:31
jast with --graph you get lines showing this: directly below the merge commit, it splits up into two lines07:31
alesan problem is, this "merge" commit introduces a behavior that I need to modify07:31
→ flaviodesousa joined07:31
alesan and I cannot find out what files have been touched07:31
jast as I said, try the -m flag on 'git show', and look at the first diff07:32
alesan basically there is a bug, and I cannot find out what files I need to investigate07:32
OK07:32
git show on the merge commit obviously07:32
jast or you can do it more explicitly: git diff 6a5bf35^ 6a5bf3507:32
→ navidr joined07:32
jast "compare first parent of the commit to commit"07:32
← cyberz left07:32
jast yep07:32
alesan I see OK let me have a look07:32
...to understand why -m is not the default ;)07:32
← TbobbyZ left07:33
jast because it shows the commit multiple times... and *usually* the merge doesn't give you any useful information because the changes are also listed in the second line going downwards from that merge07:33
this is a little more verbose, but here's how to see the commits that got merged in:07:34
git log -p 6a5bf35^..6a5bf35^207:34
that gives you not a single diff with everything mashed together but the individual commits that got merged in07:35
→ cyberz joined07:35
jast *usually* they're equivalent to the first diff from the merge, unless someone did the merge poorly and screwed something up :)07:35
alesan ok but this means that07:38
...07:38
→ borkr joined07:38
alesan wait :)07:38
← Cabanossi left07:39
← Eragon left07:39
alesan because the changes are also listed in the second line going downwards from that merge07:40
can you explain that part again?07:40
should I look "down" on the git log? to have a list of individual commits?07:41
→ karols146 joined07:41
→ Cabanossi joined07:41
→ theoceaniscool joined07:41
← cyberz left07:42
→ dtbn joined07:42
→ sz0 joined07:44
→ cyberz joined07:44
← kyan left07:45
→ basiclaser joined07:46
→ crs joined07:48
crs Hey, I am trying to add shell script as an alias - what shell is aliased script executed in? The one that git was evoked from or some default one?07:49
grawity I think Git just calls system(), which then uses /bin/sh07:49
→ Tobbi joined07:50
crs ok, thanks.07:51
→ wouter0100 joined07:52
← karols146 left07:52
← dsdeiz left07:52
← wouter0100 left07:52
← inflames left07:53
← mar77i left07:53
grawity hmm, it uses something custom, but still just sh -c <arg>07:53
→ Levex joined07:54
← exotime left07:55
← alexandre9099 left07:55
← de-facto left07:55
← theoceaniscool left07:55
→ wouter0100 joined07:55
→ de-facto joined07:56
→ alexandre9099 joined07:56
crs So, /usr/local/bin/zsh -c 'f() { echo 'test' }; f' works in terminal, but test = !/usr/local/bin/zsh -c 'f() { echo 'test' }; f' and then git test gives /usr/local/bin/zsh -c 'f() { echo 'test' }: -c: line 0: unexpected EOF while looking for matching `''07:56
→ exotime joined07:56
→ JeroenT_ joined07:56
grawity your quoting is a bit weird there07:56
crs not sure if I can simply replace !sh with that path…07:56
grawity and overall I'd suggest calling a full shellscript instead07:57
crs Ah, had to put it all in "".07:57
grawity (if you name the script git-<something>, you don't even to define an alias for it!)07:57
crs grawity: As in, outide of git? Have it at the moments, but would really like that to be part of git * family. :)07:57
→ kurkale6ka joined07:57
grawity yeah, plenty of third-party tools do that07:58
← tmg left07:58
crs grawity: Ah, did do that too, but then it wouldn't appear in zsh tab completion…07:58
grawity that's a problem with zsh's tab completion then07:58
→ raynold joined07:58
grawity I did `git help -a` and it shows me a whole section with my custom subcommands07:59
crs ok, let me try again then.07:59
← hurricanehrndz left08:00
← JeroenT left08:00
→ D4R5C0D3 joined08:01
→ karols146 joined08:02
crs OK, so I can see it in 'git commands available from elsewhere on your $PATH' section of git help -a, but still not in tab completion.08:02
→ raspado joined08:03
→ hurricanehrndz joined08:04
← roelmonn_ left08:04
← faLUCE left08:05
← dtbn left08:05
→ roelmonnens joined08:05
→ sgo11 joined08:05
→ faLUCE joined08:05
→ Andrew_K joined08:06
→ Rodya_ joined08:07
sgo11 Hi, I have an unreliable network and it always interrupts the connection. My package installer in linux will involve git clone and since it's cloning a big repo and it always failed with the error "error: RPC failed; curl 18 transfer closed with outstanding read data remaining". Is that possible to add some options in .gitconfig to overcome this issue? just tell git clone try again and again when connection interrupts occur. thanks a lot.08:07
→ theoceaniscool joined08:07
← raspado left08:08
← Cabanossi left08:08
← faLUCE left08:09
→ CaptainHeavy joined08:10
→ faLUCE joined08:11
← Rodya_ left08:11
→ Cabanossi joined08:11
→ kevinfagan joined08:12
← mkoskar left08:13
→ dvaske joined08:13
→ Tjark joined08:13
← faLUCE left08:15
→ faLUCE joined08:15
→ mkoskar joined08:16
→ dysfigured joined08:17
→ marcogmonteiro joined08:17
← stoopkid left08:17
sgo11 the error: https://hastebin.com/ujavehitip.pas08:17
← dysfigured left08:18
← zeroed left08:18
→ dysfigured joined08:18
← faLUCE left08:19
→ xaa joined08:19
→ faLUCE joined08:20
→ RxMcDonald joined08:21
→ mar77i joined08:22
← _Vi left08:22
→ tvw joined08:23
→ Eragon joined08:23
→ sbulage joined08:24
← hashtagstrashtag left08:24
→ ispn joined08:25
→ dtbn joined08:27
→ a_thakur joined08:28
← nevodka left08:28
← a_thakur left08:29
← MineCoins left08:29
→ indistylo joined08:30
← finalbeta left08:30
→ zeroed joined08:30
← zeroed left08:30
→ zeroed joined08:30
→ finalbeta joined08:30
→ mikecmpbll joined08:32
← karols146 left08:33
← aruns left08:33
← crs left08:35
→ jgrasser joined08:36
→ MineCoins joined08:36
← holodoc left08:38
← RxMcDonald left08:39
← chele left08:39
→ a_thakur joined08:42
← mkoskar left08:43
→ mkoskar_ joined08:43
mkoskar_ → mkoskar08:44
→ Vortex34 joined08:44
→ kinlo joined08:44
← dtbn left08:44
→ a_thakur_ joined08:45
← a_thakur left08:45
→ jtoy joined08:45
→ diget joined08:45
→ dtbn joined08:46
→ mischat joined08:47
→ chele joined08:47
→ dsdeiz joined08:48
← dsdeiz left08:48
→ dsdeiz joined08:48
← luke_nukem left08:48
→ Sound joined08:49
Sound → Guest7131208:49
→ jameser_ joined08:49
← chele left08:49
→ chele joined08:49
← jtoy left08:50
← cqi left08:51
← zerow left08:51
← jameser left08:51
→ pks joined08:51
→ bouncy joined08:52
← Guest71312 left08:53
← chele left08:53
→ chele joined08:53
← fragMental left08:53
← alesan left08:54
← theoceaniscool left08:56
→ redeemed joined08:56
→ holodoc joined08:58
→ karols146 joined08:59
← mar77i left08:59
→ theoceaniscool joined09:00
← sgo11 left09:01
→ sgo11 joined09:01
→ dhollin3 joined09:02
← dtbn left09:02
→ onehrxn joined09:02
← onehrxn left09:03
→ onehrxn joined09:04
← dhollinger left09:04
← onehrxn left09:05
← gtristan left09:05
→ fragMental joined09:06
→ lmatteis joined09:06
← Levex left09:07
→ dtbn joined09:07
← thinkpad left09:07
→ theiostream joined09:08
← Cabanossi left09:08
→ dersand joined09:10
→ thinkpad joined09:10
→ Cabanossi joined09:11
→ buzzLightBeer joined09:12
← theiostream left09:13
← a_thakur_ left09:13
← dtbn left09:14
← dsdeiz left09:17
← jagob left09:19
→ a_thakur joined09:20
← jokajak left09:21
← theoceaniscool left09:21
← mischat left09:21
→ gtristan joined09:22
→ theoceaniscool joined09:22
→ mischat joined09:22
← buzzLightBeer left09:22
→ clmsy joined09:25
← Gloomy left09:26
← JeroenT_ left09:27
→ JeroenT joined09:27
→ mar77i joined09:28
← sgo11 left09:29
→ sgo11 joined09:29
← Goplat left09:31
→ TbobbyZ joined09:31
← faLUCE left09:32
→ faLUCE joined09:33
→ dnukem joined09:34
← indistylo left09:35
→ mupadhye joined09:35
← TbobbyZ left09:36
← faLUCE left09:37
← overlord_tm left09:37
→ faLUCE joined09:38
← aidalgol left09:38
→ overlord_tm joined09:38
→ vuoto joined09:39
← marcogmonteiro left09:40
← dnukem left09:43
← sgo11 left09:43
→ marcogmonteiro joined09:44
→ dnukem joined09:44
→ sgo11 joined09:45
← sgo11 left09:45
→ sgo11 joined09:45
← svm_invictvs left09:46
← holodoc left09:46
→ holodoc joined09:47
← Raging_Hog left09:47
← mehola left09:49
→ mehola joined09:49
← maroloccio left09:49
← mehola left09:49
→ mehola joined09:50
← mehola left09:50
→ maroloccio joined09:51
→ mehola joined09:51
← mehola left09:51
← amrits left09:51
→ mehola joined09:51
← mehola left09:52
→ mehola joined09:52
← mehola left09:53
→ mehola joined09:53
← mehola left09:53
→ mehola joined09:54
← mehola left09:54
→ mehola joined09:55
← vuoto left09:55
← mehola left09:55
← jameser_ left09:56
→ jameser joined09:59
← imack left09:59
← rebrec left10:03
→ rebrec joined10:03
→ King_Hual joined10:04
← holodoc left10:08
→ Rodya_ joined10:08
→ xall_ joined10:09
→ holodoc joined10:09
← xall left10:09
← Cabanossi left10:09
← sarri left10:10
→ Raging_Hog joined10:10
→ Cabanossi joined10:11
← dnukem left10:11
→ imack joined10:11
← Rodya_ left10:13
Eryn_1983_FL uh guys what does this mean? and how do i fix it?10:14
https://pastebin.com/xkzC5PUY10:15
→ Assault joined10:15
→ cdleonard joined10:15
← Eragon left10:15
→ marianina8 joined10:16
Renter it means you have a corrupt object10:16
do you use intellij?10:16
jast it means your filesystem is corrupted, probably because of a system crash or power failure10:16
at least that's the most likely scenario... not the only one, of course10:17
Eryn_1983_FL no..10:17
yeah power failures10:17
how do i recover?10:17
Renter git fsck might work10:17
jast fsck will just confirm it10:17
Eryn_1983_FL i got another orgin repo10:17
Renter clean clone will fix it obv10:17
Eryn_1983_FL git clean clone?10:17
jast do you have any commits you haven't pushed yet?10:17
Eryn_1983_FL i dont think so i am good about that10:17
Renter rm -rf repo ; git clone <remote>10:18
Eryn_1983_FL unhuh10:18
there not a nicer way10:18
jast if you do have stuff you want to keep, it might be possible to fix this without starting over10:18
grawity clone the remote *elsewhere*10:18
Renter You might have luck removing the object and git fetch10:18
jast first off you can remove the file it complains about, it's worthless anyway10:18
Eryn_1983_FL ok..10:18
grawity then move its .git/objects/pack/* to the old repo's10:18
Renter yeah, like grawity said replace the corrupt object from a clean repo10:18
grawity then remove those two 0-sized files it complains about10:18
Renter or just all10:18
jast first steps I'd suggest before you try anything else: remove the corrupt file and 'git reset'10:19
grawity then run a `git fsck` just to make sure10:19
jast that might fix it10:19
← alexandre9099 left10:19
← Assault left10:19
jast if not you can always start with the more complicated things :)10:19
Renter personally I'd just wipe and get a clean one if the repo is not too big10:19
but I'm used to IDEs, backups or others corrupting my repos10:20
jast I'm not :)10:20
→ sarri joined10:20
← sarri left10:20
→ sarri joined10:20
Eryn_1983_FL git reset10:20
fatal: Could not parse object 'HEAD'10:20
jast okay, that's another thing you can probably fix. which branch did you have checked out?10:20
Eryn_1983_FL it found another corrup file10:20
→ Darcidride joined10:20
Eryn_1983_FL experimental branch10:21
jast it's called "experimental"?10:21
Eryn_1983_FL yes10:21
← marianina8 left10:21
jast does this work: git rev-parse experimental10:21
Eryn_1983_FL erin@terreis:~/puppet$git branch10:21
develop10:21
high_level_load_sensor10:21
master10:21
* support/experimental10:21
D10:21
working10:21
git rev-parse support/experimental10:21
07746dd551ee6802ef2103863cc7cc906cc9fd8010:21
jast okay, cool, just fix HEAD, then: echo "ref: refs/heads/support/experimental" >.git/HEAD10:22
← jnavila left10:22
jast obviously never do this if you don't have to :)10:22
Eryn_1983_FL ok sure10:22
jast then see if 'git reset' works after that10:22
Eryn_1983_FL nope same bad head message10:22
jast huh10:23
Eryn_1983_FL https://pastebin.com/KkP0E53010:23
jast how about this one: git cat-file -t support/experimental10:24
Eryn_1983_FL $git cat-file -t support/experimental10:24
fatal: git cat-file support/experimental: bad file10:24
→ kexmex joined10:24
jast okay, so the topmost commit on that branch is broken, too10:25
Eryn_1983_FL :(10:25
jast and in fact that's the object that got corrupted10:25
can you recover the branch contents from elsewhere?10:25
Eryn_1983_FL yes my servers had batter backup10:25
their intact ill just remake the dang repo :(10:25
jast because then you should be able to simply delete it, checkout another branch and go 'git branch -D support/experimental'10:26
or you can see if that corrupt file is in one of your backups and copy it over10:26
→ ferr1 joined10:27
→ afuentes joined10:28
bejeb what is it with today and corrupt git projects? I just got "Could not get HEAD hash. libgit2 returned: corrupted loose reference file: refs/heads/feature/review" and git status says I'm on my very first commit from 2 years ago. Does anyone have any ideas?10:29
Eryn_1983_FL fixed i moved my repo to -old and recloned..10:29
Jast is awesome he would know :)10:30
→ acetakwas joined10:32
jast bejeb: solar flares? global magnetic interference? anyway, which branch are you supposed to be on, feature/review?10:33
bejeb jast: haha. I like your theory. I'm meant to be on feature/review10:34
jast what's that line in 'git status'?10:34
actually never mind, I can imagine how this might have happened10:34
bejeb I shut down last night on feature/review. This morning I started up, loaded up tortoisegit and got that error. Ran git status and I get the message from my "initial commit" and every file is set "to be committed"10:35
← jameser left10:35
jast try 'git log -g feature/review'. if it shows things, the first entry is probably the "right" commit.10:36
bejeb actually strictly `git status` says "initial commit"10:36
jast ah, yeah, that's what happens when HEAD points to a branch that Git thinks doesn't exist yet10:36
so suppose that command gave you a reasonable commit ID, then you can resurrect your branch (example commit ID abc123): git update-ref refs/heads/feature/review abc12310:37
bejeb jast: ugh, see https://pastebin.com/raw/15YSy2kP10:38
← Cabanossi left10:38
bejeb `git reflog -n 10` gives "fatal: your current branch appears to be broken"10:39
jast okay, how about this: cat .git/logs/refs/heads/feature/review10:39
← ti2 left10:39
← zeroed left10:40
jast if that gives you something, the right commit ID is probably the second SHA1 in the last line (verify with 'git show' on that ID)10:40
→ zeroed joined10:40
→ ankit01ojha joined10:40
→ ti2 joined10:40
→ RxMcDonald joined10:40
→ Cabanossi joined10:41
RxMcDonald can you change the date of a commit in the past and not affect anything if it's not overlapping?10:41
canton7 RxMcDonald, the only way you can change the date of a commit is be rewriting history, so yes, that's going to affect things10:41
RxMcDonald i.e. I made 200 commits on master so far and I want to change the data of the commit 12310:41
jast RxMcDonald: "not affect anything" is a no-go...whenever you change a commit's metadata, all of the descendant commits (later commits in the branch) have to be changed, too10:41
canton7 git doesn't really care about whether dates re ordered10:41
jast if you're the only person working on the project that's still kind of feasible (we have great tools to rewrite history), but think hard on whether you *really* need to do it :)10:42
RxMcDonald I actually made a commit on a Friday 2 months ago and I want to move it to a saturday but i kept working on the branch10:43
and i don't want to lose the work I did after that or the commit history10:43
there are no commits on saturday so it shouldnt be a problem10:43
bejeb jast: amazing, git show shows the right commit. So do I just do a git reset --hard onto that commit?10:43
← Atm0spher1c left10:44
jast bejeb: probably won't work since the branch ref is broken, but try that update-ref thing I mentioned and then a 'git reset --hard' (no commit ID needed for that one if the first step is done)10:44
bejeb ok10:44
← Tobbi left10:44
jast you can try a 'git reset --hard <commit>' if you like, it's not like anything can break :)10:45
← Raging_Hog left10:45
bejeb jast: `git update-ref refs/heads/feature/review 702059bd` failed with "fatal: update_ref failed for ref 'refs/heads/feature/review': cannot lock ref 'refs/heads/feature/review': unable to resolve reference 'refs/heads/feature/review': reference broken"10:45
I am quite happy to trash that ref, if that's possible, and just checkout to another branch?10:46
← tvw left10:46
→ jtoy joined10:46
bejeb that branch isn't pushed to a remote yet10:46
jast okay, you can do it on filesystem level instead, but you're going to have to use the full commit ID in this case: echo 'full commit id' >.git/refs/heads/feature/review10:46
→ zerow joined10:46
→ juvenal joined10:47
jast well no matter which way you go, you probably don't want to have a broken ref forever, so might as well take care of it now :)10:47
← a_thakur left10:47
→ tmg joined10:48
← mar77i left10:48
→ dsdeiz joined10:48
← drodger left10:48
→ mar77i joined10:48
→ a_thakur joined10:49
← sotoz left10:50
← jtoy left10:50
→ sotoz joined10:51
bejeb jast: that worked, thank you. How do I buy you a libation of your choice? Interestingly I have actually lost one commit.10:51
sgo11 My package installer in linux will involve git clone and since it's cloning a big repo and it always failed with the error "error: RPC failed; curl 18 transfer closed with outstanding read data remaining". Is that possible to add some options in .gitconfig to overcome this issue? the error: https://hastebin.com/ujavehitip.pas thank you very much. I tried to fix this error for two days without luck.10:52
← kbeflo left10:53
→ drodger joined10:54
→ theiostream joined10:54
→ tvw joined10:54
bejeb jast: that's odd. `git reflog -n 10` shows the same sha for the lost commit as for the one I've restored for the branch (which is the one that showed up in .git/logs/refs/heads/feature/review)10:54
→ dtbn joined10:55
bejeb https://pastebin.com/raw/R4Xc9FRb10:55
sgo11 I even tried http postBuffer = 1600M. it doesn't help at all.10:55
:q10:55
bremner sgo11: can you clone the repo outside of your package thingy?10:56
bejeb sgo11: could you git clone mirror first, then git clone with a reference and then remove the reference?10:56
→ eihabarabia joined10:56
sgo11 bremner, no. it gave me the same error msg.10:57
bejeb sorry `git clone --mirror`10:57
bremner so maybe you need to discuss with the repo owner if their repo is unclonable.10:57
what's the url?10:57
← mar77i left10:57
bejeb jast: haha, and because I did a git reset --hard without thinking, I lost the file changes from that missing commit - oops!10:58
sgo11 bremner, https://github.com/Microsoft/vscode many people can git clone successfully. I don't know why I failed. maybe because of slow and unreliable network. I am not sure. when it's doing git clone, I does see the speed and progress and it just suddently stops.10:58
bremner yeah, cloning over crap networks is not really a strongpoint of git.10:59
sgo11 bremner, the package I tried to install is https://aur.archlinux.org/packages/visual-studio-code-oss From the comments, I don't see anyone met the same error as me.11:00
bremner yes, clone is very fast here (as expected for github)11:00
sgo11 bremner, so how can I overcome this issue please? this gives me headache. I didn't do anything except trying to fix this issue for two days.11:00
jast bejeb: you should now be able to view the reflog properly (git log -g feature/review) so if any commit in there is more up-to-date than what you have now, you can reset --hard to it11:00
→ jnavila joined11:00
sgo11 bremner, can I add some options in git and curl config to fix it? thanks.11:01
bremner no idea11:01
→ LukasT joined11:01
bremner sgo11: do you have some other host with better network? you can run the clone there, and then transfer somehow11:01
e.g. rsync a bundle.11:01
bejeb jast: you're right, I can view the reflog properly - that latest commit just isn't mentioned, despite being in `git reflog` output, albeit with the same sha as the commit before it (which I've restored)11:02
→ masuberu joined11:02
bejeb so commit c0b82ecc was what the branch is based on, and shows up in the reflog. 702059b is next (and what I've restored, and what was in the /ref/log/ file for the branch). ??????? was next, but shows up in git status with the sha 702059b11:03
It's not a biggy I guess. It would be awesome not to have to do the work again, but I'll just crack on with that for now.11:03
I'm wondering if it means that I have other problems though, and should re-clone the repo?11:04
← sz0 left11:04
sgo11 bremner, I can try that way. I don't know if it will work in my package installer or not. I have to rsync to some tmp directory before the installer quits. not sure if the installer can use that directory or not. I can try that.11:04
bremner sgo11: yeah, your package installer is more an arch issue than a git issue11:04
jast bejeb: shows up in git status? where? and why does it matter? ;)11:05
bejeb sgo11: can you edit the package installer? If so could you first clone it (either locally or remotely and then transfer it) then tell your package installer to use your local repo directory as the remote?11:05
jast bejeb: generally I'd recommend running 'git fsck' to have Git look at everything, that way if there's a remaining issue it will find it11:05
← jnavila left11:05
sgo11 bremner, right, but it's git issue first. it's git clone fails. git should take care of unreliable network.... my network is working and just unreliable.11:05
jast in the meantime, lunch break for me!11:06
bejeb jast: https://pastebin.com/raw/R4Xc9FRb HEAD@{2} is the ??????? commit, but it has the sha 702059bd1211:06
← navidr left11:06
bremner sgo11: well, that's a problem that's not going to be fixed soon enough to help you with this specific problem11:06
bejeb thanks jast. I'll just reclone and redo that work. You're awesome11:06
sgo11 bejeb, thanks for the advice. I don't know much about my package installer. still a newbie to archlinux. I will try that.11:06
bremner apparently not enough people with bad network want to work on restartable clone...11:07
jast bejeb: my guess is that commit simply never made it into the reflog proper before your filesystem/crash issue happened11:07
→ HoierM joined11:07
bejeb jast: must be11:07
jast: thank you so much again11:07
jast bejeb: but git fsck --unreachable will find commits that are not referenced from anywhere, might help finding it11:07
→ xall joined11:07
sgo11 bremner, more than 1 billion people here have this issue. people just ignore or maybe they don't know. :)11:08
bejeb jast: `git fsck` looks nasty. I'll reclone and do the work again11:08
← xall_ left11:09
→ Rodya_ joined11:09
sgo11 s/people/git developers/11:09
→ bongjovi joined11:11
← Andrew_K left11:12
→ Andrew_K joined11:12
→ TomyWork joined11:12
→ al-damiri joined11:12
→ tymczenko joined11:13
← Rodya_ left11:13
→ henriknj joined11:14
→ EvilDMP joined11:18
→ mar77i joined11:18
EvilDMP Given a file that is no longer tracked in Git (because something deleted it, at some point) how can I discover exactly which commit was responsible?11:19
selckin git log -- path/file11:19
EvilDMP selckin: perfect11:21
tahnks11:21
moritz another nice trick, to show all file deletions: git log --stat --diff-filter=D11:23
(if you aren't sure about the exact name)11:23
EvilDMP Noted, thanks11:25
← theoceaniscool left11:25
→ Murii joined11:26
← fuzzzerd left11:27
→ dglambert joined11:31
dglambert yo11:31
nedbat moritz: wow, the help for --stat is amazingly unhelpful :)11:33
→ TbobbyZ joined11:34
→ jnavila joined11:34
← zeroed left11:35
→ nowhere_man joined11:36
→ denisMone joined11:37
→ jimi_ joined11:37
← ShapeShifter499 left11:38
← TbobbyZ left11:39
← xall left11:42
← zulutango left11:43
← chipotle left11:44
→ marianina8 joined11:45
← a_thakur left11:46
← kevinfagan left11:48
jast nedbat: not if you know the diffstat tool ;)11:50
→ Tobbi joined11:52
← marcogmonteiro left11:52
← jnavila left11:53
→ notebox joined11:54
→ tcorneli joined11:55
→ mehola joined11:56
→ a_thakur joined11:58
→ mabregu joined11:59
← chigang left11:59
→ Levex joined12:00
← mehola left12:01
← Tobbi left12:01
← sunri5e left12:02
→ sunri5e joined12:02
← Tjark left12:02
← MutantMa_ left12:03
→ Raging_Hog joined12:03
← vrach left12:03
→ raspado joined12:04
← Raging_Hog left12:07
→ Raging_Hog joined12:07
← raspado left12:10
→ Rodya_ joined12:10
← dsdeiz left12:10
→ indistylo joined12:10
← rchavik left12:14
← Rodya_ left12:14
→ rchavik joined12:15
→ aw1 joined12:16
← Andrew_K left12:17
← pbrewczynski left12:17
→ Ardethian\ joined12:17
→ kpease joined12:17
← tkore left12:21
← rchavik left12:29
→ kbeflo joined12:29
← aavrug left12:30
← Zialus left12:30
← chardan left12:30
→ Zialus joined12:31
← jeffreylevesque left12:32
← mar77i left12:33
→ mar77i joined12:33
→ buffal0 joined12:33
← aw1 left12:34
→ aw1 joined12:34
← theiostream left12:35
→ theiostream joined12:35
← ayogi left12:36
→ scottjl joined12:36
← cdleonard left12:37
RxMcDonald what happens if your last commit is today and you add a new commit with --date in the past12:37
canton7 not a lot12:37
there's at least one third-party history that gets confused, but other than that...12:38
*history viewing12:38
*viewer, grr. haven't finished my afternoon tea...12:38
selckin you can change dates to anything you want12:38
← aw1 left12:38
RxMcDonald NOICE!!12:38
selckin you even have 2 of them, commit time and author time12:39
→ vuoto joined12:39
canton7 the order in which commits occurred is tracked by the fact that each commit knows what its parent is, rather than date12:39
RxMcDonald so i can put all the commits in different dates, past future etc and everything will be OK?12:40
selckin yes12:40
→ rchavik joined12:40
→ jtoy joined12:40
← gtristan left12:41
→ chipotle joined12:41
canton7 RxMcDonald, are you trying to game the github contribution activity graph? :P12:41
RxMcDonald canton7: actually i messed up so i wanna fix it12:42
canton7 u know what happens if ur employer sees ur commit to ur side project in a work day12:42
← tcorneli left12:43
← zerow left12:44
← lukasdboer left12:45
yarekt Heh You can tell them that commit time doesn't correlate to when the code was written12:46
→ lukasdboer joined12:46
← lukasdboer left12:46
→ tmsmith joined12:46
→ lukasdboer joined12:47
→ Tobbi joined12:47
→ Darion joined12:47
← CussBot left12:48
→ CussBot joined12:49
→ jeffreylevesque joined12:49
selckin if they are the invasive in your time then you have bigger problems12:50
← dtbn left12:51
→ synthroid joined12:51
← chipotle left12:52
→ oleo joined12:53
← Cabanossi left12:53
← Bass10 left12:53
← faLUCE left12:55
→ theoceaniscool joined12:55
→ Cabanossi joined12:56
→ faLUCE joined12:56
← dvaske left12:56
← lukasdboer left12:57
← tmsmith left12:57
→ lukasdboer joined12:58
← vuoto left12:58
→ marcogmonteiro joined12:58
→ dvaske joined12:59
← eihabarabia left12:59
→ ExoUNX joined13:00
← mupadhye left13:00
← jozwior left13:02
← dvaske left13:03
→ Gsham joined13:05
→ tmsmith joined13:06
rchavik → TheCroogoBot13:08
← a_thakur left13:09
→ cheesegits joined13:10
→ dvaske joined13:13
→ ThomasLocke joined13:14
← mabregu left13:14
TheCroogoBot → rchavik13:15
← dvaske left13:15
→ courrier joined13:17
← netroxen left13:18
rchavik → CroogoBot13:18
→ codematt joined13:18
← sgo11 left13:19
← juvenal left13:20
← theoceaniscool left13:20
→ thebird joined13:20
→ dtbn joined13:21
← cheesegits left13:21
← ronin_work left13:22
→ juvenal joined13:22
← tymczenko left13:23
← bannakaffalatta left13:23
→ kbs joined13:24
→ chigang joined13:26
← marianina8 left13:27
← juvenal left13:27
→ marianina8 joined13:27
→ MutantMahesh joined13:28
→ theoceaniscool joined13:28
→ s2013 joined13:28
→ Dougie187 joined13:31
← marianina8 left13:32
→ jnavila joined13:32
→ steeze joined13:33
← chachasmooth left13:33
← Tobbi left13:33
→ mischat_ joined13:34
← karols146 left13:34
→ Ice_Strike joined13:34
← theoceaniscool left13:36
← RxMcDonald left13:36
← mischat left13:37
→ chachasmooth joined13:39
→ TbobbyZ joined13:39
← s2013 left13:40
← jimi_ left13:40
← basiclaser left13:41
← weakdan left13:41
→ jimi_ joined13:43
← TbobbyZ left13:44
← marcogmonteiro left13:44
← ExoUNX left13:45
← CroogoBot left13:46
→ CroogoBot joined13:46
→ s2013 joined13:46
→ marcogmonteiro joined13:46
← MineCoins left13:47
← CroogoBot left13:47
→ kbeflo_ joined13:49
→ karols146 joined13:50
← kbeflo left13:50
← neunon left13:51
→ neunon joined13:52
→ weakdan joined13:52
→ jameser joined13:53
← D4R5C0D3 left13:55
→ Tobbi joined13:55
→ YuGiOhJCJ joined13:57
→ theoceaniscool joined13:57
→ Es0teric joined13:57
→ mohabaks joined13:57
← Soni left13:58
← dec0n left13:58
mohabaks hello folks can someone explain to me in simpler term what's rebase all about and when would I find it useful than merging. thanks.13:58
← rscata left14:00
← kbeflo_ left14:00
← mda1 left14:02
→ publio joined14:02
→ mda1 joined14:02
← s2013 left14:04
→ rominronin joined14:04
→ davidfetter_ge joined14:07
← Levex left14:07
→ bannakaffalatta joined14:09
← planigan left14:10
← mohabaks left14:11
← davidfetter_ge left14:11
← sarri left14:11
← Es0teric left14:11
→ Rodya_ joined14:11
Vampire0 mohabaks, !merge_vs_rebase14:11
gitinfo [!merge_or_rebase] For a detailed discussion of the dis-/advantages of merge and rebase, and when to best use which, see: https://coderwall.com/p/ny1hia -- and here's how Linus explains which one to use: http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html14:11
→ lavalamp joined14:12
→ sarri joined14:12
← sarri left14:12
→ sarri joined14:12
→ planigan joined14:12
→ dave0x6d joined14:12
← notebox left14:12
← jnavila left14:13
→ dave_uy joined14:13
← netj left14:13
→ notebox joined14:13
→ netj joined14:14
← Rodya_ left14:14
→ Rodya_ joined14:14
← iveqy left14:14
← notebox left14:14
→ LeBlaaanc joined14:14
← Brski left14:14
dave_uy When I try git diff --submodule=diff I get fatal: bad object ... Is this a new bug?14:15
→ Es0teric joined14:15
← thebird left14:16
dhollin3 → dhollinger14:17
← robotroll left14:17
→ thebird joined14:17
→ kbeflo joined14:17
← sbulage left14:18
← clmsy left14:18
→ jagob joined14:18
→ AaronMT joined14:19
→ DarkPsydeLord joined14:19
→ gugah joined14:19
← courrier left14:19
→ jokajak joined14:21
← kbs left14:24
→ bes_internal joined14:25
→ tymczenko joined14:25
→ `mx joined14:25
→ notebox joined14:25
← overlord_tm left14:26
→ senaps joined14:27
→ eh3 joined14:28
→ _Vi joined14:28
← jameser left14:30
→ kbs joined14:31
← tymczenko left14:32
→ LionsMane joined14:32
← ferr1 left14:33
← thebird left14:34
← Rodya_ left14:34
← steeze left14:35
← jeffreylevesque left14:35
← sotoz left14:35
→ jeffreylevesque_ joined14:35
→ thebird joined14:36
→ ResidentBiscuit joined14:37
→ Rodya_ joined14:39
← thebird left14:40
← Raging_Hog left14:41
→ thebird joined14:41
← ResidentBiscuit left14:41
→ ash_workz joined14:42
← askb left14:42
← lordjancso left14:42
← sweatsuit left14:44
avar Yay my patch for making @{U} synonymous with @{u} is now in git.git master14:44
So much typo'd @{U} cases will now work..14:44
_ikke_ avar: yay14:45
→ sweatsuit joined14:45
← tvw left14:46
→ tvw joined14:46
← thebird left14:47
→ adgtl- joined14:47
← mischat_ left14:48
← LionsMane left14:48
→ mischat joined14:49
avar Also hopefully [tag,branch,for-each-ref] --no-contains will land soon: https://github.com/git/git/commit/ac3f5a346814:50
→ roelmonn_ joined14:51
← bes_internal left14:51
→ rchavik joined14:52
→ Starky joined14:52
→ tymczenko joined14:52
→ robotroll joined14:52
← ngladitz left14:52
← raynold left14:54
→ WakiWork joined14:54
← tmg left14:54
← roelmonnens left14:54
→ LionsMane joined14:55
→ alburaq joined14:55
← tymczenko left14:55
← roelmonn_ left14:56
→ tymczenko joined14:56
gitinfo set mode: +v14:56
WakiWork hi, is it possible to do an octopus merge with unrelated histories? even when specifiying --allow-unrelated-histories git says "Unable to find common commit with <first branch specified>"14:56
← Gsham left14:57
← jimi_ left14:57
← JeroenT left14:58
→ Nilesh_ joined14:58
→ gableroux joined14:59
← ExeciN left14:59
→ madewokherd joined14:59
→ flavius joined15:00
→ zerow joined15:02
← Darion left15:03
→ VicMackey joined15:03
← Silmarilion left15:04
→ oskarkv joined15:04
dave_uy Correction, when I am in a submodule which has it's own submodules and I run git diff -submodule=diff in the submodule I get fatal: bad object.15:05
alburaq anyone knows how to resolve this conflict? https://github.com/qutebrowser/qutebrowser/pull/249315:05
i'm caveman15:05
is that error resolvable by me?15:05
→ ExeciN joined15:06
cjohnson github won't let you do a PR if your merge results in conflicts15:06
it won't let you merge a PR that is*15:06
However you can still merge the branch yourself and close the PR15:06
alternately, you can merge the target branch into your local branch and resolve the conflicts there15:06
← EvilDMP left15:07
cjohnson so when you merge back, there are no conflicts, and the PR will let you go through15:07
alburaq i forked that repo. but when i do git fetch upstream, i don't get those changes locally15:07
← VicMackey left15:08
→ Sound joined15:09
→ roelmonnens joined15:09
Sound → Guest1504215:09
alburaq cjohnson: did github let me yet to do a PR? does that look like i have already made a PR?15:09
→ bannakaf_ joined15:10
← chele left15:10
→ TbobbyZ joined15:10
→ xall joined15:11
→ Atemu joined15:12
→ mt joined15:13
← bannakaffalatta left15:13
← roelmonnens left15:14
← de-facto left15:15
→ shgysk8zer0_ joined15:15
→ steeze joined15:15
→ s1scha joined15:15
→ sparetire joined15:15
→ de-facto joined15:16
cjohnson you can create a PR, you just can't merge it automatically if it conflicts15:16
git fetch upstream only updates your local copies of upstream, if you want to merge those changes into your local branchesy ou have to do that15:16
git checkout my-foo ; git merge upstream/my-foo15:17
etc15:17
← redeemed left15:20
← tymczenko left15:20
→ tymczenko joined15:20
→ s2013 joined15:22
← shgysk8zer0_ left15:22
← ogny left15:23
→ Gustavo6046 joined15:25
← theiostream left15:27
← robattila256 left15:28
← mmlb left15:28
→ mmlb joined15:29
← kurkale6ka left15:30
→ Eragon joined15:31
→ jstimm joined15:32
→ theiostream joined15:34
← s2013 left15:35
← MutantMahesh left15:36
→ VicMackey joined15:37
→ thiago joined15:39
→ dvaske joined15:39
← rchavik left15:40
← Cabanossi left15:40
← kbs left15:40
← robotroll left15:41
→ ResidentBiscuit joined15:41
→ ayogi joined15:41
← VicMackey left15:42
→ robotroll joined15:42
→ Cabanossi joined15:42
← flaviodesousa left15:43
← alburaq left15:45
← Guest15042 left15:46
→ Sound_ joined15:47
→ courrier joined15:48
courrier Hi there! I stashed changes on path/file, I then renamed path/file to new_path/file and commited the renaming, I then stash-poped, but git replied: Dropped refs/stash@{0} (93978a99db898ba355d730d08f5e3bfd735e1a33)15:49
Is it due to the renaming? Can I still recover my stash?15:49
← WakiWork left15:49
→ rosiu joined15:49
← sea-gull left15:49
grawity that's what `git stash pop` always says15:50
immae courrier: stash pop updates the workdir and drops the stash15:50
grawity since after all it's apply+drop15:50
immae so your stash is in workdir/staging :p15:50
← ThomasLocke left15:50
grawity you can `git stash store 93978a99db898ba355d730d08f5e3bfd735e1a33` to un-drop it15:50
→ Gsham joined15:50
← rosiu left15:51
→ rosiu joined15:52
← zerow left15:52
→ vuoto joined15:52
← rosiu left15:53
→ synbit joined15:53
← jstimm left15:53
→ rosiu joined15:53
← vuoto left15:53
→ mischat_ joined15:53
→ vuoto joined15:53
← theoceaniscool left15:54
→ orbyt_ joined15:54
→ jimklo joined15:55
← mischat left15:56
→ igeaod joined15:56
← igeaod left15:56
courrier grawity: mmmmh, but "git diff" shows nothing after that, I should see the content of my changes15:57
← synbit left15:58
thiago git diff HEAD15:58
← masuberu left15:58
→ thebird joined15:58
courrier OK sorry, the first stash was indeed empty, my actual work was one stash below15:59
→ jungsubk joined16:00
→ kbs joined16:02
→ shgysk8zer0_ joined16:03
← yehowyada left16:03
← King_Hual left16:03
← Tatou left16:04
← tmsmith left16:04
→ King_Hual joined16:05
→ raspado joined16:06
← bongjovi left16:08
← mikecmpbll left16:09
← armyriad left16:09
→ armyriad joined16:09
← perlpilot left16:09
← raspado left16:11
→ rwb joined16:11
← mischat_ left16:12
→ blueyed joined16:12
→ mischat joined16:13
→ durham joined16:13
→ masuberu joined16:14
← blueyed left16:14
→ blueyed joined16:15
blueyed Is it possible to reset/discard changes added to the index? I have used git-stash --keep-index before, and committed them already, and now want to keep only what "git diff" shows, but not what "git diff --cached" shows.16:15
← chachasmooth left16:15
← tymczenko left16:16
→ svm_invictvs joined16:17
← mischat left16:17
← xall left16:18
→ regedit joined16:18
→ Noldorin joined16:18
immae blueyed: you can do something like git diff > patch && git reset --hard && git apply patch, but maybe there is a faster way16:21
→ tmsmith joined16:22
immae or you can commit the index, then the diff, then git rebase -i HEAD^^^ and delete the commit from the index16:23
→ xall joined16:25
→ nitric joined16:26
← tmsmith left16:27
→ tmsmith joined16:28
→ chachasmooth joined16:29
← thebird left16:30
← weualo left16:31
← synthroid left16:32
→ tymczenko joined16:32
← tymczenko left16:33
← d^sh left16:33
→ pbrewczynski joined16:33
→ kbeflo_ joined16:34
← chachasmooth left16:34
→ d^sh joined16:35
← kbeflo left16:36
← vuoto left16:37
→ s2013 joined16:39
← Sound_ left16:39
→ mischat joined16:39
→ perlpilot joined16:40
→ linyt joined16:40
← kpease left16:41
← imack left16:42
→ zerocua_ joined16:42
→ jstimm joined16:43
← eh3 left16:43
← zerocua left16:43
← Oatmeal left16:44
← blueyed left16:44
→ blueyed joined16:45
← LukasT left16:45
→ raspado joined16:46
← snowalpaca left16:47
→ paul424 joined16:47
→ JJtG joined16:47
→ shinnya joined16:48
JJtG hey guys I have a question. For some reason I have local commits that I have never made. Maybe the VS git plugin made them I dont know. Question is how do I get rid of those. I read that git reset --hard origin/master should do it. But I guess I need to change the names for origin and master? I think my local branch is called release e.g16:50
← gableroux left16:51
→ gableroux joined16:52
→ overlord_tm joined16:52
← tmsmith left16:53
← masuberu left16:53
moritz JJtG: yes. And that will lose all other changes you made, including uncommitted changes16:54
cjohnson I don't think reset changes working copy does it16:54
I thought it was a metadata change only16:54
← nowhere_man left16:54
JJtG moritz, thats okay. I do not do code changes, I dont even understand why git keep thinking i do because I dont16:54
cjohnson well, you are, somewhere16:54
they don't just magicaly appear :P16:55
← s2013 left16:55
JJtG using UE4 I just do content, all I do is pull and compile16:55
but somehow changes appear constantly that I have not made16:55
cjohnson changes? or commits16:56
← gableroux left16:56
cjohnson if you are compiling and they have not set it up to ignore every built and/or changed file then yeah compiling will generate some untracked changes16:56
you need to first clarify if what you have are commits, or untracked changes16:56
moritz maybe some generated files are under version control, and modified by the build16:56
← shgysk8zer0_ left16:56
→ tmsmith joined16:57
JJtG both, just now, the git vs plugin showed me that I had changed 120 files. A friend suggested git sync, but that gave a merge conflict. after exiting that, the plugin got stuck on every subsequent pull operation, so I gues I am using the console now16:57
→ mischat_ joined16:58
← borkr left16:59
← chigang left16:59
JJtG but yeah git branch -a gives me a list one is green with an asterisk. I assume that is my local branch. And then a bunch of red ones. One of the red ones has a -> origin/release I assume thats the remote. But whats its name origin or release?16:59
← jstimm left16:59
→ gableroux joined16:59
JJtG so would the command be git reset --hard release/origin ?17:00
← mischat left17:01
→ chachasmooth joined17:01
← codematt left17:01
← thiago left17:01
← mischat_ left17:02
← raspado left17:02
← karols146 left17:03
→ dreiss joined17:03
→ deepak joined17:03
← DarkPsydeLord left17:04
← gableroux left17:04
→ jstimm joined17:05
← Asenar left17:06
JJtG its not git reset --hard release/origin it gives an error saying fatal:ambiguous argument release/origin : unknown revision or path no in the working tree17:07
→ gopar joined17:07
← Cabanossi left17:10
← Nilesh_ left17:10
→ darkmist_ joined17:10
← eroux left17:10
→ Fallen0223 joined17:10
← tvw left17:10
← deepak left17:10
→ tang^ joined17:11
→ Cabanossi joined17:11
→ iveqy joined17:12
← s1scha left17:12
→ TikityTik joined17:12
← rominronin left17:14
→ jrnieder joined17:15
→ rominronin joined17:15
→ nowhere_man joined17:16
← TomyWork left17:17
← Noldorin left17:17
→ imack joined17:17
→ coreyfarrell joined17:18
← darkmist_ left17:19
→ Relevant joined17:19
← nowhere_man left17:20
gitinfo set mode: +v17:20
→ darkmist_ joined17:20
→ nowhere_man joined17:21
→ gableroux joined17:21
Relevant Hello all. Currently in process of implementing a development process, probably going with some style of scrumban. What I haven't been able to figure out is how to go about merging from QA to Production branches if there are overlapping changes and one is approved and one is not.17:21
← rokups left17:22
cjohnson Relevant: my approach is, features get branched from master, and merged into QA for testing. once approved, the feature gets merged into master17:22
we never merge QA17:22
→ karols146 joined17:22
coreyfarrell hello, does git have a way to do a dry-run cherry-pick to another branch? I want to find out if current HEAD commit can be cleanly cherry-picked to origin/different-branch without performing a checkout on that branch or actually changing anything.17:22
Relevant That's what we tried in the past. It seemed to work, not perfectly, but seemed to work17:23
cjohnson I think merging QA only works if you do "release planning" and then you either have to delay the release until all features are approved, or you have to revert the merges back out of QA, which can be hugely messy17:23
another part of what we do is to rebase the features from master to keep PRs clean and keep the branches up to date17:23
Relevant cjognson: ugh, exactly! Glad what I said made sense and you get it! :D17:23
← darkmist_ left17:24
cjohnson The only downside I've found to my approach is that if you have to make a commit into QA because two features conflict with each other or overlap in some specific way17:24
Relevant Right, that's what I was just typing lol. If it only works in QA, because of another feature that is in QA...17:25
cjohnson for example in one branch I might refactor an API and go around to all the places that uses the API to update their usage. If another branch introduces a new call to the old style of API, I would have to add a commit to QA which updates just that one usage17:25
→ codematt joined17:25
cjohnson Usually when I come into a case like that, I make a secondary branch from master17:25
and merge those two branches into that secondary branch17:25
and put the fixing commit in there17:25
then merge the merged branch into qa for testing, and merge it into master for release17:25
Relevant So you basically have a QA "version" and a master "version" of the feature?17:25
cjohnson yeah in a way. I know it means QA is not a perfect test for prod but honestly I don't know of any workflow that guarantees that17:26
Relevant Yeah, I think you're right. The only way I've thought of is doing full scrum with sprints17:26
Or at least some kind of development stop17:27
← shinnya left17:27
cjohnson yeah if you can absolutely guarantee that you can do a proper release schedule it works17:27
I've just never had stakeholders that would cooperate17:27
lol17:27
Relevant Yep, same situation here17:27
← nowhere_man left17:27
→ DarkPsydeLord joined17:27
← gableroux left17:27
→ gableroux joined17:27
→ nowhere_man joined17:27
← Rodya_ left17:28
→ nixjdm joined17:30
← Bock left17:30
← Es0teric left17:32
→ moL-Ou joined17:32
→ marianina8 joined17:33
← nowhere_man left17:33
← marianina8 left17:35
← Darcidride left17:35
→ marianina8 joined17:35
→ s2013 joined17:37
← matoro left17:39
→ thiago joined17:39
→ Oatmeal joined17:39
→ snowalpaca joined17:39
← snowalpaca left17:39
← fakenerd left17:41
← cbreak left17:41
→ matoro joined17:41
→ joshszep joined17:42
→ snowalpaca joined17:43
← acetakwas left17:43
→ snowalpa_ joined17:43
← snowalpa_ left17:43
→ thebird joined17:44
→ synthroid joined17:45
→ acetakwas joined17:45
→ shgysk8zer0_ joined17:45
← JJtG left17:46
← snowalpaca left17:47
← indistylo left17:48
→ MutantMahesh joined17:49
→ duderonomy joined17:50
→ cbreak joined17:50
duderonomy → Guest3462517:50
← finalbeta left17:50
← jimklo left17:51
→ finalbeta joined17:51
← AstralStorm left17:52
← thebird left17:52
← elect_ left17:52
← courrier left17:52
→ AstralStorm joined17:53
← imack left17:55
← rominronin left17:55
← diogenese left17:56
→ Acerific joined17:57
→ Es0teric joined17:57
← jstimm left17:57
→ imack joined17:57
← Tobbi left17:59
← marcogmonteiro left18:00
← notebox left18:02
→ diogenese joined18:02
← Guest34625 left18:02
→ notebox joined18:02
→ doener joined18:03
← notebox left18:03
← frobnic left18:04
→ thebope joined18:04
→ jimi_ joined18:05
→ Doginal joined18:05
← schleppel left18:06
← marianina8 left18:06
← _Vi left18:06
→ duderono_ joined18:07
→ marianina8 joined18:07
← matoro left18:09
← marianina8 left18:09
→ Sasazuka joined18:09
→ Forlorn joined18:11
→ frobnic joined18:11
→ ertesx joined18:12
← moL-Ou left18:13
→ marianina8 joined18:15
← ertes left18:15
ertesx → ertes18:15
→ TomyLobo2 joined18:15
→ thebird joined18:17
← xall left18:18
← Relevant left18:19
← marianina8 left18:19
← zerocua_ left18:20
→ terravires joined18:22
→ zerocua_ joined18:22
→ Evidlo joined18:25
→ marianina8 joined18:26
→ jstimm joined18:29
← marianina8 left18:31
→ mar77i_ joined18:33
← Murii left18:33
← Eragon left18:34
→ freimatz joined18:34
← PioneerAxon left18:34
← mar77i left18:35
← dtbn left18:35
→ giraffe joined18:37
→ PioneerAxon joined18:38
bannakaf_ → bannakaffalatta18:38
← Cabanossi left18:40
→ dtbn joined18:40
← s2013 left18:41
→ Cabanossi joined18:41
kusznir Hi all: I have what I think is a simple git quesiton: on github, where I have forked a project, how do I bring in the commits I am behind on from the original?18:41
← jstimm left18:42
← henriknj left18:42
→ henriknj joined18:42
→ marianina8 joined18:43
→ notebox joined18:43
→ mikecmpbll joined18:45
→ dsdeiz joined18:46
Evidlo kusznir: https://help.github.com/articles/syncing-a-fork/18:46
actually this one is better http://stackoverflow.com/questions/7244321/how-do-i-update-a-github-forked-repository18:46
← pbrewczynski left18:47
→ Kardoso joined18:48
← al-damiri left18:48
← chachasmooth left18:49
→ BadApe joined18:49
→ xall joined18:50
BadApe hi, i think i have a valid ssl cert, but i get the message SSL certificate problem: unable to get local issuer certificate18:50
← coreyfarrell left18:51
dglambert Hey if I git branch foo and then git branch foo again, does it overwrite my original foo18:53
mar77i_ → mar77i18:53
→ chachasmooth joined18:53
qqx dglambert: It will report an error saying that the branch already exists.18:53
→ Noldorin joined18:55
← scoobertron left18:55
→ scoobertron joined18:55
dglambert ok18:57
i was worried I overwrote something18:57
terravires Is it possible to move all files *.meta from a submodule into the parent repo?18:57
← TbobbyZ left18:59
terravires And not move the files? So they could stay Parent/Submodule/file.meta but it's part of parent's repo and not submodule?18:59
→ trewe joined19:00
← senaps left19:01
→ oskarkv_ joined19:01
→ Rodya_ joined19:01
→ _Vi joined19:02
← codematt left19:02
← oskarkv left19:04
← dsdeiz left19:04
← ayogi left19:04
→ boombatower joined19:05
Evidlo Is it possible to rebase these 9 commits on the pip-installable branch onto master after they've already been merged? http://imgur.com/a/qwRYd19:05
← dtbn left19:05
qqx terravires: Locally you can do `git rm --cached Parent/Submodule; git add Parent/Submodule`. But other repos won't deal well with updating that.19:05
← boombatower left19:05
← afuentes left19:06
→ boombatower joined19:06
← orbyt_ left19:06
terravires qqx, Maybe my structure is wrong. Someone suggested I use three repos. I have a Server, Client and share "Core". Sadly, the Client requires files in Core that I don't need/want in Server. Is there a way to do that cleanly?19:07
→ mathneverends joined19:07
← Atemu left19:07
mathneverends hello19:07
I am having an issue19:07
I have a branch off a master in a git repo19:07
that i have been working on from my main computer19:07
but i am temp on a laptop19:08
i cloned the branch to my laptop19:08
but i cannot launch my angular server as files paths are to my main computers local drive19:08
for some reason19:08
← jimi_ left19:08
mathneverends (i did not manually set them)19:08
→ dtbn joined19:08
mathneverends Anyone know what the heck is going on?19:08
qqx terravires: Ahh, so it's only some of the files you want to take out of the submodule. No that isn't possible.19:08
→ roby10 joined19:09
→ orbyt_ joined19:09
moritz mathneverends: did you commit some generate files? or use absolute paths anywhere?19:09
terravires qqx, Yeah, I needed to share all the files except the *.meta files in Core. I'm kind of lost how to do this... any suggestions?19:10
→ mischat joined19:10
mathneverends moritz: yes but unintentionally19:10
moritz mathneverends: then fix it19:10
qqx terravires: The closest you could do would be to have a dir in the client which mixes the .meta files with symlinks to the files from the core submodule which is placed elsewhere.19:11
← oleo left19:13
← PioneerAxon left19:13
qqx terravires: Only other option I could think of that might approach that would be to leave those files in the core repository, and use a sparse checkout of that in the server copies.19:14
terravires qqx: what about combining client+core, and then use some kind of .gitignore for the server using client/core as a submodule?19:14
qqx But that isn't something that can be setup in the submodule definition that is committed.19:14
← mathneverends left19:15
← dtbn left19:15
← dermoth left19:16
← xall left19:16
→ dermoth joined19:16
→ chris349 joined19:18
chris349 Is there any way to use git stash to only show the changes that would be made, but not actually make them yet?19:18
← lmatteis left19:18
→ julius joined19:19
julius hi19:19
whats the return code for git when i run git pull and there are changes in my local repository? got no "not updated" git repo currently19:19
← drodger left19:20
moritz chris349: git stash show -p19:20
→ dtbn joined19:20
moritz julius: the exit code is 0, if that's what you want to know19:20
chris349 moritz, I think that is only showing past stashes. When I try to do a git pull I get this error: error: Your local changes to 'Gemfile.lock' would be overwritten by merge19:21
But the git stash show command does not list that file19:21
← BenderRodriguez left19:21
moritz chris349: if git pull gives you this error, you have local modifications19:21
chris349: and 'git diff' and 'git diff --cached' will show them19:21
stashes aren't relevant for that19:22
chris349 I want to know what change will be made with git stash. Always when I get this error do do a git stash followed by git pull19:22
→ matoro joined19:22
chris349 So how can I be certain git stash will change what files?19:22
→ borkr joined19:23
perlpilot chris349: Why are you uncertain?19:24
Random832 well you could look at the stash afterward with git stash show19:24
or generally predict it from the output of git status19:24
chris349 because git status and git stash show are not saying the same thing19:24
← HardlySeen left19:24
Random832 well git stash show is for after you make the stash19:25
→ jnewt_ joined19:25
→ xall joined19:25
chris349 So how can I see what git stash will do without actually doing it?19:25
perlpilot chris349: you don't (I don't think).19:25
→ drodger joined19:25
perlpilot chris349: but, git-stash always saves the contents of the working dir and the index. That's kinda all it does.19:26
← hahuang61 left19:26
BlaXpirit yeah just do it and undo it, what could go wrong19:27
chris349 lol19:27
perlpilot BlaXpirit: fear is the mind killer :-)19:27
BlaXpirit chris349, may i interest you in http://www.praqma.com/stories/git-autostash/19:27
← jnewt left19:28
← dtbn left19:28
perlpilot BlaXpirit++ I didn't know about --autostash19:29
BlaXpirit neither did i, until today, in fact19:29
chris349 I would rather something like a prompt from git pull: File XYZ conflict, keep source or destination version?19:29
BlaXpirit so i only tested it once before recommending here. but what could go wrong19:29
perlpilot But that comment on "non-trivial conflicts" is quite right.19:29
BlaXpirit chris349, you will get that conflict when stash tries to reapply19:30
perlpilot chris349: I often do what that auto-stash article mentions. git stash; git pull; git stash pop19:30
chris349 I have never reapplied a stash19:30
I just use it to overcome the git pull errors19:30
← cyberz left19:32
← sparetire left19:32
← theiostream left19:32
perlpilot chris349: in the case of a conflict, it's not always keep change A or B, sometimes it's C--meld the two sides into something else.19:32
→ d5sx43 joined19:33
→ tyreld joined19:33
BlaXpirit yeah i was gonna say that, i'm just incredulous that this never comes up19:33
← bwn left19:33
→ cyberz joined19:33
→ raijin joined19:34
perlpilot chris349: you know, you could always commit the changes in your working dir before you pull19:34
→ gtristan joined19:35
BlaXpirit adn get the same problem then19:35
Random832 use pull --rebase when you do that19:35
→ sparetire joined19:35
perlpilot BlaXpirit: it's not exactly the same... at least your changes would be saved in a commit :)19:35
Random832 unless you're doing something weird19:35
BlaXpirit yeah you feel safe, that's good, perlpilot19:35
Random832 technically stashing does save your changes in a commit19:36
perlpilot yeah, but it's kind of a second-rate commit. It doesn't live with others. The stash is commits on the other side of the tracks.19:37
BlaXpirit ok so autostash completely won me over19:37
→ al-damiri joined19:37
→ Es0teric_ joined19:37
← Es0teric left19:38
→ PioneerAxon joined19:38
← d5sx43 left19:39
→ roelmonnens joined19:39
← Cabanossi left19:39
→ synthmeat joined19:40
→ TbobbyZ joined19:41
→ Cabanossi joined19:41
→ yqt joined19:41
→ oleo joined19:42
← roelmonnens left19:44
→ luke_nukem joined19:47
← pks left19:49
→ bariscant joined19:49
matthiaskrgr I wonder why during "Writing objects" stage of git gc, CPU is still often the bottleneck19:50
→ pks joined19:50
← xall left19:50
← kbeflo_ left19:53
← Garen left19:54
← oleo left19:55
← bannakaffalatta left19:55
← synthmeat left19:55
← trewe left19:56
← cyberz left19:56
→ jj995 joined19:57
jj995 is "working copy" the proper term for the files resulting from a git clone possibly after uncommitted/unstaged changes?19:58
← synthroid left19:59
→ cyberz joined19:59
qqx jj995: man gitglossary refers to that as the "working tree" but I suspect most people would consider that as a fine alternative.20:00
gitinfo jj995: the gitglossary manpage is available at http://jk.gs/gitglossary.html20:00
← ResidentBiscuit left20:00
→ bwn joined20:00
jj995 qqx and gitinfo: thanks!20:01
gitinfo jj995: you're welcome, but please note that I'm a bot. I'm not programmed to care.20:01
→ Murii joined20:02
← jeffreylevesque_ left20:03
→ synthmeat joined20:05
← raijin left20:05
← paul424 left20:05
← bwn left20:06
← Synthead left20:07
← Cabanossi left20:09
→ Pseudocrat joined20:10
← Pseudocrat left20:10
→ Pseudocrat joined20:10
← MutantMahesh left20:10
← ankit01ojha left20:10
→ Cabanossi joined20:11
→ sevenever joined20:13
← marianina8 left20:15
→ hahuang61 joined20:15
← rosiu left20:15
→ Discovery joined20:16
→ dtbn joined20:16
→ ysh joined20:16
→ marianina8 joined20:17
← marianina8 left20:17
← rwb left20:17
→ marianina8 joined20:17
← LionsMane left20:19
← govg left20:20
← freimatz left20:21
→ bwn joined20:22
← synthmeat left20:23
→ synthmeat joined20:23
← peepsalot left20:23
→ govg joined20:25
→ iota_pi joined20:26
← karols146 left20:28
→ jeffreylevesque joined20:30
← BadApe left20:31
Random832 matthiaskrgr, isn't that the part where it finds delta codings for everything?20:32
matthiaskrgr that is Compression I though? :O20:33
Random832 well it's a kind of compression, yeah20:33
compression is cpu intensive in general20:33
← matoro left20:34
← robotroll left20:36
Random832 it's got to compare every blob object against every other blob (well, not *every*, but it has to do it a lot) to figure out which is the best one to use as the delta base20:37
← Sasazuka left20:37
→ raijin joined20:38
← terravires left20:39
← tmsmith left20:40
← prg3 left20:40
← yqt left20:42
← imack left20:43
← Acerific left20:43
← orbyt_ left20:43
← Fallen0223 left20:43
→ prg3 joined20:43
→ Sasazuka joined20:44
← YuGiOhJCJ left20:45
← ysh left20:45
→ matoro joined20:45
→ orbyt_ joined20:46
← Es0teric_ left20:46
← phelix left20:47
→ pifon joined20:47
→ Fallen0223 joined20:47
→ tremby joined20:47
→ benlieb joined20:48
← gtristan left20:49
tremby I'm trying to parse git status --porcelain or git status -z. Parsing filenames becomes difficult when they contain a space, because then suddenly the name is quoted. -z gets around this. But then it becomes complicated again when there is a rename staged. The original name is on the line with the status (`RD oldname\0` for example), and then new name is then on the next line alone (`newname\0`). If newname is something like "MM something" I would20:50
Am I missing something? Is there a way to get porcelain or -z to *not* tell me the new names for any renames?20:50
→ Tobbi joined20:52
→ Es0teric joined20:52
← Fallen0223 left20:53
→ MrWoohoo joined20:53
← Cabanossi left20:55
← dglambert left20:56
→ Cabanossi joined20:56
→ durham_ joined20:57
← bariscant left20:57
tremby Oh man, and it turns out that an untracked file with spaces in it is *not* quoted. Seems like a bug.20:58
→ Fallen0223 joined20:58
→ seveneve2 joined20:58
→ bariscant joined20:59
← gugah left20:59
← durham left20:59
← durham_ left20:59
← Murii left21:00
← Ice_Strike left21:01
← buffal0 left21:01
→ Aleric joined21:01
← Oatmeal left21:01
tremby I had oldname and newname backwards for the -z version above. But there's still the problem if the old name started with samething which looks like a status string21:01
← sevenever left21:02
→ amdi_ joined21:03
Aleric Hello all. I'm trying to set up a git server on my machine. When I try to access the server for the first time, using 'git push origin master', I get the error "fatal: 'repos/hamukau.git' does not appear to be a git repository". I found that running the push command results in an attempt to run "git-receive-pack 'repos/hamukau.git'" (without the double quotes) on the remote server.21:04
And indeed, I get the same error when I do either:21:05
← shgysk8zer0_ left21:05
Aleric sean:~/tmp/foobar>ssh hamukau "git-receive-pack 'repos/hamukau.git'"21:05
fatal: 'repos/hamukau.git' does not appear to be a git repository21:05
← prg3 left21:05
Aleric The remote server is a jailroot... The directory looks ok, because I do not get this error when I run:21:06
sean:~/tmp/foobar>sudo chroot /opt/gitserver/hamukau/root /bin/git-receive-pack repos/hamukau.git21:07
008c0000000000000000000000000000000000000000 capabilities^{}report-status delete-refs side-band-64k quiet atomic ofs-delta agent=git/2.7.421:07
etc..21:07
→ durham joined21:07
Aleric Anyone got an idea what is wrong? :/21:07
s/do either:/do:/21:08
→ rwb joined21:08
→ alexandre9099 joined21:09
← kexmex left21:10
→ jimi_ joined21:11
→ jstimm joined21:11
→ p4trix joined21:12
→ tvw joined21:14
← Fallen0223 left21:15
→ jost_ joined21:15
pifon → nomad10121:15
nomad101 → pifon21:16
→ oleo joined21:18
← amdi_ left21:18
← jost__ left21:19
← jstimm left21:19
Aleric nm, I figured it out... chroot does a chdir '/', while the ssh ends up in the users "home directory" which wasn't /.21:19
→ Fallen0223 joined21:20
← raulp left21:20
← bariscant left21:21
→ askb joined21:21
→ Atm0spher1c joined21:21
← drodger left21:23
← joshszep left21:24
→ peterbecich joined21:24
→ miczac joined21:24
gitinfo set mode: +v21:25
← Forlorn left21:25
← AaronMT left21:25
← zerocua_ left21:27
← Fallen0223 left21:27
→ roelmonnens joined21:27
→ drodger joined21:29
← UrsoBranco left21:29
← durham left21:29
→ durham joined21:30
← roelmonnens left21:31
→ Fallen0223 joined21:32
→ tmsmith joined21:32
← cyberz left21:33
← durham left21:34
← Pseudocrat left21:34
← alexandre9099 left21:35
→ cyberz joined21:35
→ alexandre9099 joined21:35
← Noldorin left21:36
→ zerocua joined21:36
→ cdg joined21:39
→ durham joined21:40
← jtoy left21:40
→ schleppel joined21:41
← thebird left21:42
← texasmynsted left21:45
→ prg3 joined21:47
← gunnaro left21:47
← Es0teric left21:48
← madewokherd left21:53
← schleppel left21:54
nacho → polyzwn21:54
→ Achylles joined21:54
→ YuGiOhJCJ joined21:54
polyzwn → polyzen21:54
← bambams left21:55
← jimi_ left21:56
← marianina8 left22:00
← cdg left22:02
← linyt left22:04
← blackwind_123 left22:06
← tvw left22:08
→ blackwind_123 joined22:08
← miczac left22:08
← Tobbi left22:10
→ bannakaffalatta joined22:10
← Dougie187 left22:10
← nixjdm left22:11
← Fallen0223 left22:12
→ m0viefreak joined22:13
← acetakwas left22:15
← hahuang61 left22:16
← Gsham left22:16
← mikecmpbll left22:17
→ miczac joined22:20
gitinfo set mode: +v22:20
→ Sasazuka_ joined22:20
← Sasazuka left22:20
← YuGiOhJCJ left22:20
→ acetakwas joined22:22
← mischat left22:22
→ mischat joined22:22
← Rodya_ left22:25
→ mikecmpbll joined22:26
← mischat left22:27
→ anuxivm joined22:27
← drodger left22:28
→ Tobbi joined22:28
← raijin left22:29
martin_g_ → martin_g22:31
← overlord_tm left22:32
← martin_g left22:32
← gopar left22:32
→ Vinnie_win_d joined22:33
→ gopar joined22:33
← Vinnie_win left22:34
← gopar left22:34
→ drodger joined22:34
→ gopar joined22:34
← LeBlaaanc left22:35
← Sasazuka_ left22:40
→ raijin joined22:42
→ Rodya_ joined22:42
← zerocua left22:42
→ zerocua joined22:45
← rigid left22:46
← svm_invictvs left22:46
→ Sasazuka joined22:47
→ rokups joined22:48
→ rigid joined22:48
← rigid left22:48
→ rigid joined22:48
→ dendazen joined22:50
← Kardoso left22:50
→ cahoots joined22:50
Aleric Should a git server be able to create arbitrary files in it's root? Currently I see 'config', 'description' and 'HEAD'.22:51
cahoots hi, i want to resolve some merge conflicts with the master branch, but i don't actually want to merge the latest master into my code, because that would invalidate all of my build artifacts and force a clean build. is there any way to do this?22:52
→ Noldorin joined22:52
cahoots like, even just seeing what merging would look like, so then i can change my code not to cause it would be good22:52
← Sasazuka left22:53
→ wizardedit joined22:54
← Cabanossi left22:54
Aleric cahoots: you should be using ccache and not worry about that :p22:55
→ bambams joined22:55
← bambams left22:55
→ bambams joined22:55
Aleric https://linux.die.net/man/1/ccache22:55
cahoots Aleric, it's not in place yet sadly22:56
→ Cabanossi joined22:56
→ Sasazuka joined22:57
← Ardethian\ left22:57
→ tmg joined23:00
→ joshszep joined23:00
← kristofferR left23:00
→ robattila256 joined23:00
→ cyphase joined23:00
→ zulutango joined23:01
← Emperor_Earth left23:02
→ svm_invictvs joined23:02
← Sasazuka left23:03
→ kristofferR joined23:04
← gopar left23:04
→ gopar joined23:04
cahoots it looks like there are some ways to just merge specific files, but they all look super hacky23:05
← gopar left23:05
→ gopar joined23:05
→ hahuang61 joined23:06
← borkr left23:07
→ Sasazuka joined23:09
→ fakenerd joined23:10
← finalbeta left23:11
← tremby left23:13
← fakenerd left23:14
← lavalamp left23:15
→ roelmonnens joined23:16
← tang^ left23:16
← henriknj left23:17
← kristofferR left23:18
→ madewokherd joined23:19
← roelmonnens left23:20
→ mischat joined23:23
→ nowhere_man joined23:23
← denisMone left23:28
→ kristofferR joined23:29
→ Sasazuka_ joined23:29
← kristofferR left23:31
← Sasazuka left23:32
← Tobbi left23:32
→ cahoots_ joined23:32
← cyphase left23:32
→ kristofferR joined23:33
← Noldorin left23:33
← Sasazuka_ left23:34
← duderono_ left23:34
← cahoots left23:34
← gopar left23:35
→ duderonomy joined23:35
← anuxivm left23:36
← cahoots_ left23:36
→ cyphase joined23:37
← matoro left23:37
→ Sasazuka joined23:37
→ Oatmeal joined23:39
← Cabanossi left23:39
→ matoro joined23:41
← prg3 left23:41
→ Cabanossi joined23:41
duderonomy Hello. How to move a commit from an old branch (to master). The old branch has not been worked on for 2 weeks. I will probably hace conflist to resolve. What are my options or approach? thx!23:41
→ durham_ joined23:42
→ afuentes joined23:42
duderonomy I think that I see two options: cherry-pick and rebase a branch. Not sure how to proceed. Trying to research which one is preferable for my case.23:42
← re1 left23:43
← doener left23:44
→ Garen joined23:44
← steeze left23:45
→ prg3 joined23:45
← durham left23:45
← durham_ left23:46
← mischat left23:47
← cyphase left23:47
→ cahoots joined23:49
← kristofferR left23:50
→ jtoy joined23:51
→ cyphase joined23:52
← nitric left23:53
← cyberz left23:53
→ Sasazuka_ joined23:53
→ elsevero joined23:53
→ cyberz joined23:54
← Sasazuka left23:55
← joshszep left23:56
→ joshszep joined23:58
← cyphase left23:59

Logs Search ←Prev date Next date→ Channels Documentation