IRCloggy #git 2018-11-24

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.

2018-11-24

← sanches left00:01
→ kapil____ joined00:03
← finalbeta1 left00:05
← cdown left00:06
→ cdown joined00:08
← venmx left00:10
→ jottr_ joined00:13
← dege left00:13
→ dege joined00:13
← dege left00:14
→ tomfarr joined00:14
→ oojacoboo joined00:16
→ sanches joined00:17
← akushner left00:18
← jottr_ left00:19
→ andyhuzhill joined00:21
← sanches left00:21
← TheRuckus left00:22
→ TheRuckus joined00:23
→ invisbl joined00:24
← invisbl left00:29
→ irc_viewer_test joined00:36
→ sanches joined00:37
← irc_viewer_test left00:38
→ cdown_ joined00:39
← cdown left00:41
cdown_ → cdown00:41
← sanches left00:42
← mollusk left00:42
← dre_ left00:43
← cdown left00:46
→ mollusk joined00:47
→ sanches joined00:48
← sanches left00:52
→ Bobdude joined00:57
→ fukakai joined00:57
← CodeSlingerPaul left00:59
← m0viefreak left01:01
→ sanches joined01:08
→ orbyt_ joined01:11
← sanches left01:13
← Regon left01:18
← n3wborn left01:18
→ veegee joined01:22
← orbyt_ left01:23
← justanotheruser left01:27
→ cdown joined01:28
→ sanches joined01:28
← tomfarr left01:29
← sanches left01:29
→ orbyt_ joined01:36
→ sanches joined01:39
→ justanotheruser joined01:41
→ jottr_ joined01:41
← sanches left01:44
→ jottr joined01:46
← jottr_ left01:46
← jottr left01:50
→ armyriad joined01:50
← TheRuckus left01:54
← orbyt_ left01:58
← Anthaas left01:59
→ sanches joined01:59
← sanches left02:04
→ Anthaas joined02:05
→ dpyro joined02:08
← dpyro left02:09
→ sanches joined02:20
← F0rTex left02:22
→ mikemcowie joined02:22
← netj left02:22
→ netj joined02:23
→ F0rTex joined02:23
→ dre_ joined02:24
← sanches left02:25
← cbrt64 left02:28
→ finalbeta joined02:29
→ cbrt64 joined02:30
← fukakai left02:31
→ sgn joined02:32
→ dpyro joined02:33
← dpyro left02:35
→ dpyro joined02:37
→ dpyro_ joined02:38
← dpyro_ left02:38
→ dpyro_ joined02:39
← dpyro_ left02:39
← manuelschneid3r left02:40
← dpyro left02:41
← wootehfoot left02:44
← markkm left02:44
← mikemcowie left02:45
LordRyan why doesn't this work?02:46
blag/static/node_modules/*02:46
!blag/static/node_modules/*/dist/*02:46
gitinfo [!blog] Blog or Answer posts(like StackOverflow), while helpful and informative, are quite often outdated, give bad advice, or are just plain wrong. Please don't rely solely upon them, or treat them as authoritative. We recommend reading the documentation and consulting multiple sources, such as the expert advice to be found on IRC02:46
LordRyan in my .gitignore file02:46
excuse me sir bot, but i specifically said "b l a g" as to not be "blog"02:47
→ mikemcowie joined02:47
LordRyan i can use 'ls' on the bottom one so i know that it /should/ match02:47
oh well, for now time to check node_modules into version control02:48
← armin left02:49
→ armin_ joined02:50
LordRyan oh, /ffs/ i had `/dist` ignored as `dist` >_>02:51
← cd left02:52
LordRyan oh! great! one of the node packages doesn't even properly package `dist` making this entire thing useless!02:53
← cbrt64 left02:53
← mikemcowie left02:55
→ igemnace joined02:55
← watabou left02:56
→ orbyt_ joined02:58
→ watabou joined03:03
← cdown left03:07
← sylario left03:14
→ sanches joined03:21
← xcm left03:21
→ xcm joined03:22
← sanches left03:26
→ cbrt64 joined03:31
→ sanches joined03:32
← cbrt64 left03:35
← sanches left03:36
→ cbrt64 joined03:39
← Mattiaslndstrm left03:39
lagothrix → Guest4477903:41
← Guest44779 left03:41
→ lagothrix joined03:41
← kapil____ left03:43
← armyriad left03:43
→ armyriad joined03:43
→ dpyro joined03:44
← dpyro left03:46
→ jottr joined03:46
← jubal left03:47
→ dpyro joined03:50
← jottr left03:51
→ jubal joined03:52
→ sanches joined03:52
← \void left03:55
← sanches left03:57
→ jottr joined03:57
← dpyro left03:57
→ prakashd1 joined03:59
← jottr left04:02
← mrCyborg|zzz left04:05
→ dpyro joined04:05
→ mrCyborg|zzz joined04:05
← veegee left04:07
← kadoban left04:11
→ kapil____ joined04:14
← novum left04:17
→ timj1 joined04:25
← prakashd1 left04:27
← timj left04:28
→ boombatower joined04:34
→ mzf joined04:36
← sword left04:43
← oojacoboo left04:45
→ jungsubk joined04:52
← Cabanossi left04:59
→ Cabanossi joined04:59
→ agio joined05:01
→ pks_ joined05:01
← pks left05:03
pks_ → pks05:03
← igemnace left05:05
← tharkun left05:07
← sgn left05:07
armin_ → armin05:08
← jungsubk left05:12
← mollusk left05:17
→ mollusk joined05:18
→ cfoch joined05:20
← orbyt_ left05:26
← xcm left05:29
toothe github doesn't seem to work the way http-protocol.txt documents05:29
→ xcm joined05:29
→ sanches joined05:35
← sanches left05:40
→ sanches joined05:45
← sanches left05:50
← dre_ left05:54
← andyhuzhill left05:55
→ jottr joined05:58
← jottr left06:03
← jleclanche left06:03
→ andyhuzhill joined06:04
← andyhuzhill left06:06
→ andyhuzhill joined06:07
→ dpyro_ joined06:16
← dpyro left06:19
toothe nevermind...my code was just broke06:23
→ orbitex joined06:27
→ akushner joined06:34
← bolovanos left06:34
→ forgon joined06:41
← Muzer left06:41
forgon Is it convention to include patch numbers in commit messages if a bugtracker issue is fixed in multiple commits?06:46
→ sanches joined06:46
← PEG left06:48
→ Muzer joined06:51
← sanches left06:51
→ irc_viewer_test joined06:55
← Goplat left06:56
→ sanches joined06:57
← irc_viewer_test left06:58
← ghost43 left07:01
→ ghost43 joined07:01
← sanches left07:01
→ igemnace joined07:06
← kapil____ left07:13
← orbitex left07:16
→ sanches joined07:17
← milossh left07:22
← sanches left07:22
→ prakashd1 joined07:23
→ YuGiOhJCJ joined07:25
→ sanches joined07:28
← sanches left07:33
→ spacesuitdiver joined07:36
→ sanches joined07:38
← sanches left07:38
_ikke_ Some projects require it, other projects are more relaxed about it07:39
← netj left07:43
→ netj joined07:44
→ lomex joined07:45
→ sanches joined07:48
← przemoc left07:49
← dpyro_ left07:51
← sanches left07:53
← Toadisattva left07:56
← neunon left07:57
→ neunon joined07:58
→ TJ- joined07:58
→ jottr joined07:59
← forgon left08:00
← jottr left08:04
→ unashamed joined08:09
→ jottr joined08:10
← jottr left08:18
← unashamed left08:21
→ sydbarret joined08:25
→ czart joined08:27
← g00s left08:28
← OrangeManBad left08:33
← liefer left08:34
← mollusk left08:34
→ liefer joined08:35
→ sanches joined08:39
← jubal left08:39
→ chiroo64 joined08:40
← sanches left08:40
← cbrt64 left08:43
→ OrangeManBad joined08:44
→ Sound joined08:48
→ sanches joined08:50
→ cbrt64 joined08:52
← Oatmeal left08:54
← sanches left08:55
← sydbarret left08:55
→ Oatmeal joined09:00
→ sanches joined09:00
← Bobdude left09:02
← sanches left09:04
→ crimastergogo joined09:06
← cfoch left09:09
→ dre_ joined09:10
← crimastergogo left09:11
→ crimastergogo joined09:11
← mobile_c left09:14
← GreenJello left09:15
→ elsheepo joined09:15
← lomex left09:17
← prakashd1 left09:18
← spacesuitdiver left09:19
→ Noti joined09:20
→ sanches joined09:20
→ n3wborn joined09:22
← boombatower left09:23
← Mat001 left09:24
→ mescalinum joined09:25
← sanches left09:25
← crimastergogo left09:27
→ mollusk joined09:27
→ crimastergogo joined09:28
← Sound left09:33
← andyhuzhill left09:33
→ jubal joined09:33
← elsheepo left09:46
← crimastergogo left09:49
→ buyfn joined09:49
← czart left09:52
← dre_ left09:53
→ crimastergogo joined09:53
← crimastergogo left09:53
← mikecmpbll left09:53
→ crimastergogo joined09:54
→ plexigras joined09:56
← shabius left09:58
→ sgn joined09:58
→ shabius joined10:00
→ dhollin3 joined10:01
← mollusk left10:01
← dhollinger left10:04
← sgn left10:04
→ czart joined10:08
→ kapil____ joined10:09
← catsup left10:17
→ catsup joined10:17
← zulutango left10:17
→ zulutango joined10:17
← catsup left10:18
→ catsup joined10:19
→ coco joined10:24
← crimastergogo left10:25
→ mikecmpbll joined10:28
← coco left10:30
→ coco joined10:32
→ sanches joined10:32
← sanches left10:37
→ yyy joined10:38
→ aib joined10:40
→ sn0w joined10:42
→ sanches joined10:43
← topdownjimmy left10:45
→ topdownjimmy joined10:46
← sanches left10:47
→ jottr joined10:48
← buyfn left10:51
← jottr left10:52
→ jottr joined10:58
→ leeN joined11:00
← lankanmon left11:00
→ sanches joined11:03
← jottr left11:04
→ m0viefreak joined11:04
← mikecmpbll left11:05
← sanches left11:07
→ pawle joined11:08
← chiroo64 left11:09
→ jottr joined11:21
→ sanches joined11:34
← bachler left11:34
→ bolovanos joined11:35
→ sylario joined11:36
← sanches left11:38
→ bachler joined11:41
→ buyfn joined11:48
← silverballz left11:52
→ silverballz joined11:53
→ wootehfoot joined11:53
→ Sound joined11:54
→ sanches joined11:54
← Noti left11:54
← sanches left11:59
→ oxymoron93 joined12:01
← irdr left12:02
→ irdr joined12:02
← sn0w left12:04
← buyfn left12:04
→ Aquazi joined12:06
→ lankanmon joined12:07
← eb0t left12:09
→ cdown joined12:10
→ st-gourichon-f joined12:11
← st-gourichon-fid left12:13
→ CodeSlingerPaul joined12:13
→ prakashd1 joined12:14
→ sanches joined12:15
→ linuxmodder joined12:18
← sanches left12:20
← bachler left12:20
← igemnace left12:30
→ bachler joined12:33
→ sanches joined12:35
→ Regon joined12:39
← oxymoron93 left12:39
← sanches left12:40
→ Essadon joined12:41
← jim left12:52
← Odyseus left12:52
→ jim joined12:53
→ buyfn joined12:53
→ oxymoron93 joined12:54
← yyy left12:57
← finalbeta left12:59
← jim left13:06
← coco left13:07
→ theoceaniscool joined13:11
→ jim joined13:15
→ sanches joined13:16
→ quackgyver joined13:17
← Sound left13:17
← theoceaniscool left13:20
← sanches left13:21
→ sanches joined13:27
← sanches left13:31
← wootehfoot left13:31
→ lomex joined13:36
→ sanches joined13:37
← YuGiOhJCJ left13:38
← n3wborn left13:39
→ rsrx joined13:39
← sanches left13:41
← wildlander left13:43
← buyfn left13:49
→ yyy joined13:50
← yyy left13:51
← leeN left13:52
← khisanth_ left13:52
← naoey left13:54
← lomex left13:55
→ buyfn joined13:55
→ khisanth_ joined14:05
← czart left14:06
→ sanches joined14:08
→ naoey joined14:10
← sanches left14:12
→ ZetFury joined14:13
← linuxmodder left14:19
→ eb0t joined14:23
← naoey left14:25
← buyfn left14:30
← FabTG left14:32
→ FabTG joined14:33
→ ARLOSonline joined14:34
← ARLOSonline left14:35
← prakashd1 left14:35
→ ARLOSonline joined14:35
← R2robot left14:39
Hello71 never heard of anybody putting the patch numbers in the commit messages14:39
→ buyfn joined14:40
Hello71 the bug tracker id, sure14:40
→ Raed|Laptop joined14:40
→ mou joined14:42
→ prakashd1 joined14:42
← buyfn left14:50
→ czart joined14:51
dhollin3 → dhollinger14:52
→ ferdna joined14:54
← ARLOSonline left14:56
→ tharkun joined14:57
→ gxt joined14:59
← mitchellsalad__ left15:01
→ buyfn joined15:02
← eb0t left15:03
→ dpyro joined15:10
→ kp__ joined15:11
→ jamiejackson joined15:12
→ novum joined15:13
← kp__ left15:14
→ Mat001 joined15:20
→ jungsubk joined15:24
← ferdna left15:25
← AWindowsKrill left15:25
← ekleog left15:25
← Raed|Laptop left15:26
→ ekleog joined15:26
→ AWindowsKrill joined15:26
→ mikecmpbll joined15:31
→ sgn joined15:33
← dolphy left15:34
→ Mattiaslndstrm joined15:34
← tchan left15:34
→ eb0t joined15:34
← mowcat left15:36
→ Toadisattva joined15:38
→ darthfork joined15:39
← darthfork left15:42
← jungsubk left15:43
→ blackandblue joined15:48
→ jungsubk joined15:48
→ tchan joined15:48
← jungsubk left15:51
→ crimastergogo joined15:57
→ sanches joined16:00
→ yyy joined16:02
→ finalbeta joined16:05
← sanches left16:05
← sgn left16:11
← dpyro left16:11
→ sanches joined16:11
← prakashd1 left16:12
← sanches left16:15
← rsrx left16:17
→ cdown_ joined16:21
→ linuxmodder joined16:23
← cdown left16:24
cdown_ → cdown16:24
← yyy left16:26
→ CheckDavid joined16:26
→ peacememories joined16:29
← CodeSlingerPaul left16:30
← M6HZ left16:34
→ M6HZ joined16:37
→ sanches joined16:41
← timj1 left16:43
→ timj joined16:44
← cbrt64 left16:45
← sanches left16:47
← Aquazi left16:47
→ ToBeFree joined16:48
→ cbrt64 joined16:48
← ToBeFree left16:50
← crimastergogo left16:51
← xcm left16:53
→ crimastergogo joined16:53
→ xcm joined16:53
→ mobile_c joined16:57
← bolovanos left16:57
→ venmx joined16:58
← peacememories left17:02
dakar → tester17:02
→ dpyro joined17:11
→ sanches joined17:12
← crimastergogo left17:14
← sanches left17:17
→ cfoch joined17:17
→ orbyt_ joined17:20
→ thiago joined17:23
→ Bobdude joined17:25
← Anthaas left17:28
→ Anthaas joined17:29
← eb0t left17:31
→ GreenJello joined17:33
← dpyro left17:33
→ eb0t joined17:34
→ def_jam joined17:34
→ mollusk joined17:35
→ Bobguy joined17:36
→ sanches joined17:36
← eblip left17:36
def_jam → eblip17:37
→ dpyro joined17:38
← Bobdude left17:39
← venmx left17:42
→ crimastergogo joined17:45
← gxt left17:47
→ acresearch joined17:49
← mobile_c left17:49
acresearch people i am having triuble pushing my project, it is litirally 100kb in total, but when i push i get rejected saying my project limit is 100MB what can i do?17:49
→ Arkaniad joined17:50
acresearch i am thinking of deleting all my files and upload them manually17:50
→ mobile_c joined17:52
← squirrel left17:55
← buyfn left17:56
→ dpyro_ joined17:56
← thiago left17:56
acresearch i can't find anything online to solve this issue, i am having difficulty using the correct search termsn17:56
i think the best way is just to delete my project and start a new one. i am not sure why there is bug, very strange17:57
bremner quite possibly you commited something you didn't mean to17:58
git commit -a will do that17:58
or git add .17:58
← sanches left17:58
bremner when you say your project is 100k, where do you get that info? does it include .git?17:59
← dpyro left17:59
→ squirrel joined17:59
← crimastergogo left18:00
acresearch bremner: it is the entire directory on my computer18:01
bremner: git commit -a just says i am 6 commits ahead of the master18:01
bremner err. I meant commit -a is a command that can cause problems18:02
acresearch bremner: aha18:02
hmmm18:02
i think i need to reset something18:02
but i don't know what it is18:02
i am not sure how git talked to the github server18:02
bremner are you on linux or mac?18:03
→ crimastergogo joined18:03
acresearch linux18:04
bremner and "du -sh" from the repo root reports 100k?18:04
acresearch bremner: 164MB ?!?! where is that large file????18:04
→ dpyro joined18:05
bremner find . -size +10M18:05
or choose a smaller number if that shows nothing18:05
acresearch bremner: found it18:05
delete it?18:05
bremner you need to remove it from your history18:06
!large-file18:06
acresearch bash: !large: event not found18:06
gitinfo [!large_files] Git isn't yet great at large files(larger than RAM). Look at !annex for solutions. You can find them (after gc) with: git verify-pack -v .git/objects/pack/pack-*.idx | grep blob | sort -k3nr | head | while read s x b x; do git rev-list --all --objects | grep $s | awk '{print "'"$b"'",$0;}'; done18:06
← Case_Of left18:07
bremner err. thanks gitinfo, but how to rewrite?18:07
gitinfo bremner: you're welcome, but please note that I'm a bot. I'm not programmed to care.18:07
acresearch hahaha18:07
← dpyro_ left18:07
→ Case_Of joined18:08
bremner you can use !bfg18:08
gitinfo A tool designed to remove large files, or passwords from history: https://rtyley.github.io/bfg-repo-cleaner/ (!rewrite applies)18:08
bremner or man git-filter-branch18:08
gitinfo the git-filter-branch manpage is available at https://gitirc.eu/git-filter-branch.html18:08
→ sanches joined18:08
bremner see the examples section in the latter18:09
or if it's the most recent commit, you can reset to the parent, and commit again18:09
acresearch how ro reset?18:09
_ikke_ reset what18:09
acresearch bremner: this is really complicated18:11
too complicated for the alternative18:11
← dpyro left18:11
acresearch i think i will just delete every file in the project and upload the ones i have locally, i think this will solve my issue18:11
→ lomex joined18:11
bremner make a backup, in case you are wrong18:12
← oxymoron93 left18:13
acresearch bremner: ok18:13
← sanches left18:13
→ Goplat joined18:17
← linuxmodder left18:20
acresearch bremner: ok deleted project and re-uploaded strange this happened, i am worried now that git may not ber very reliable,,, how can i take precuations in the future?18:20
→ linuxmodder joined18:20
bremner I don't think git did anything wrong here. You almost certainly made a mistake. That mistake was recoverable, but you decided not to bother.18:22
Be careful what you commit?18:22
BTW you're probably correct that it was faster in your case to start again, if you finished already.18:22
→ buyfn joined18:24
bremner if you use "git diff --cached --stat" before you commit, you will see large files staged for commit18:24
← crimastergogo left18:25
← Anthaas left18:26
→ mikedd joined18:27
→ Anthaas joined18:29
→ sanches joined18:29
acresearch ok18:32
now another question, i have a large file that i want to associate with my project, but it is very large, where can i put it to give people access to it to download?18:32
canton7 github releases?18:33
how large?18:33
acresearch canton7: at the moment 1GB (but could get larger in the future)18:34
← sanches left18:34
→ dpyro joined18:34
canton7 https://help.github.com/articles/distributing-large-binaries/18:35
acresearch canton7: hmmm well it was more of a database than a compiled binary (database.tar.bz2 for easier download)18:37
→ sanches joined18:40
→ m3ddle joined18:40
← sanches left18:44
sh4rm4^bnc_ → sh4rm4^bnc18:46
acresearch what do you guys think of this? https://git-lfs.github.com/18:49
← dpyro left18:52
→ dpyro joined19:03
→ Narrat joined19:06
← mescalinum left19:07
parsnip seems to be oriented around macos and github19:08
oh, it's github.com, the css fooled me.19:08
→ mescalinum joined19:08
bremner git-lfs is the up and coming big-provider alternative to git-annex and git-media19:08
never used it myself, but I guess it's automatically better for the corporatiti19:08
bitbucket also supports it, iirc19:09
j416 when I tried git-lfs it was quite tied to github; I didn't find it trivial to set up a server.19:09
→ ca1ek joined19:09
j416 also, the users of your project will need to install git-lfs to be able to download the data19:10
do you need to have that data version controlled?19:10
toothe yeah, I just had a buffer under-write in my code.19:10
anyone know the http-protocol for git? I see that each sha is preceeded by a 4-character prefix. What does that mean?19:10
j416 if you can survive without version control, perhaps just put the file on some other hosting19:11
toothe I don't understand from the documentation.19:11
j416 toothe: I don't know the internals of that protocol, but what is the prefix?19:11
toothe it carries, but 0041 0048, 004d19:11
i don't know what that means.19:12
← im0nde left19:12
← johnny56 left19:13
← M6HZ left19:16
← mollusk left19:17
j416 I assume you're reading this https://github.com/git/git/blob/7f4e64169352e03476b0ea64e7e2973669e491a2/Documentation/technical/http-protocol.txt#L257-L25919:17
I couldn't figure it out from that either.19:17
cryptic.19:17
→ NpcOrangeManBad joined19:18
← OrangeManBad left19:18
→ LiftLeft joined19:19
canton7 git-lfs is distributed with git now, at least on windows. Gitlab supports it as well.19:20
LiftLeft → OrangeManBad19:20
← NpcOrangeManBad left19:21
→ jakogut_ joined19:21
→ dolphy joined19:23
canton7 toothe, which bit of the negotiation are you looking at, specifically?19:24
← Toadisattva left19:26
→ Toadisattva joined19:26
→ im0nde joined19:26
→ kp__ joined19:27
← kp__ left19:27
→ leeN joined19:30
← mzf left19:35
Brohan → Foehan19:35
→ mollusk joined19:36
→ mzf joined19:36
→ spacesuitdiver joined19:39
← m3ddle left19:40
← ca1ek left19:41
← blackandblue left19:44
→ cdown_ joined19:46
← mescalinum left19:47
← cdown left19:48
cdown_ → cdown19:49
→ mescalinum joined19:50
Foehan → Brohan19:55
→ dege joined19:56
→ wildlander joined19:57
← davidfetter left19:59
→ davidfetter joined20:01
→ acercle joined20:03
→ tomfarr joined20:03
→ jubal_ joined20:04
← jubal left20:06
→ ferdna joined20:08
← cdown left20:10
← TJ- left20:11
→ cdown joined20:11
→ gxt joined20:13
→ dviola joined20:13
→ irc_viewer_test joined20:13
→ TJ- joined20:14
← mescalinum left20:17
← xcm left20:18
→ mescalinum joined20:18
→ xcm joined20:18
→ oojacoboo joined20:19
← mollusk left20:24
← linuxmodder left20:25
→ linuxmodder joined20:25
← quackgyver left20:26
→ mowcat joined20:27
j416 canton7: til, didn't know this. ty.20:28
not on macos, it seems20:29
toothe canton7: sorry, I walked away.20:29
canton7: So, when you do a clone, you get a list of SHA values, but you have a prefix with 4 characters.20:30
so, in my case:20:30
the SHA is d8d6c93ad972c054e06dbe74d1745cde9f78c9c820:30
I have a prefix like this: 00fad8d6c93ad972c054e06dbe74d1745cde9f78c9c820:30
the values 00fa20:30
→ pd09041999 joined20:33
← liefer left20:34
canton7 toothe, which bit of the clone? where specifically do you see this? what's the wider context?20:36
toothe canton7: So, I am running 'git clone http://somesite/"20:36
and I run wireshark on it to capture the HTTP session.20:36
← ZetFury left20:36
toothe so, this is referenced in the Documentation/technical/http-protocol.txt is referenced.20:37
Now, the protocol as I understand it starts with 000020:37
then sends 4 more bytes, then the SHA.20:37
then a space, then the name of the branch.20:37
That's where I'm confused.20:37
What are those 4 bytes?20:37
canton7 right, so this is the very first response from the server?20:38
toothe Yes.20:38
I guess I don't understand what that means.20:38
→ cd joined20:39
→ yyy joined20:39
toothe I hope my question is clear.20:39
→ courrier joined20:41
canton7 yep, spotted the same thing in the http-protocol doc now20:41
toothe Which line in the doc :)20:41
← dpyro left20:42
canton7 https://github.com/git/git/blob/7f4e64169352e03476b0ea64e7e2973669e491a2/Documentation/technical/http-protocol.txt#L21820:42
toothe ah yes. So in this context, 004820:43
canton7 yes20:43
toothe so, the specific response starts at line 28120:43
and I get lost in after line 285.20:43
canton7 ah, duh20:44
https://github.com/git/git/blob/7f4e64169352e03476b0ea64e7e2973669e491a2/Documentation/technical/protocol-common.txt#L5120:44
j416 er, s/#L257-L259// fwiw on link.20:44
typo20:44
toothe ahhhhhhh20:44
wow20:44
canton7 j416, that's the first 5 bytes here: https://github.com/git/git/blob/7f4e64169352e03476b0ea64e7e2973669e491a2/Documentation/technical/http-protocol.txt#L21620:44
(and only on that line)20:44
TJ- isn't it the line length?20:44
canton7 yes, it is20:45
toothe so, 66 bytes.20:45
okay, that's actually pretty cool.20:45
TJ- no, it isn't, well not counting the differences on lines 218-21920:45
the difference is 9 characters as best I can count20:46
so 0048/0042 would mean 620:46
unless someone manually created those examples and they aren't accurate of course20:46
j416 canton7: yeah; hence the late fix. ty20:47
I had accidentally marked the lines while reading20:47
canton7 j416, aah, I see what you meant20:48
→ mollusk joined20:50
→ \void joined20:51
canton7 TJ-, yeah, L219 looks like it's got the wrong length on it. L218 is fine.20:51
→ triad joined20:51
→ venmx joined20:51
← lomex left20:53
→ dpyro joined20:54
→ irc_viewer_test1 joined20:56
← czart left20:56
→ Governador joined20:58
← irc_viewer_test left20:59
← Lunatrius left21:00
→ Unode joined21:03
→ mbwgh joined21:04
← mollusk left21:05
← acresearch left21:05
← Eryn_1983_FL left21:06
← irc_viewer_test1 left21:07
→ Lunatrius joined21:07
→ Eryn_1983_FL joined21:07
mbwgh During a rebase, is it normal that the new commits are reported like `[detached HEAD 6ef1c5d] Commit message`? Before and after the rebase I am not in a detached head state. I would just like to make sure I am not in some kind of inconsistent state, because I have been experimenting quite a bit.21:07
Unode Hi all. I have two git repositories. Calling them old and new. The new was created as a result of a recursive copy of the old at some point in the past. Both repositories kept being updated independently but the new repository received files not present in the old. When merging them I have to use the --allow-unrelated-histories because effectively they don't share a commit, although they share content. I can21:08
guess one commit to serve as anchor based on the date of the first commit of the new repository. But if I didn't, is there an easy way to know what would be the best commit to reattach the two histories while keeping each in its own branch?21:08
Additionally each repository has its own tags (which were renamed to avoid collisions).21:09
j416 mbwgh: normal.21:09
mbwgh: it just means you're not on a commit that is referenced by a branch head21:10
→ YuGiOhJCJ joined21:10
← anddam left21:10
j416 mbwgh: or rather, you have a specific commit checked out directly and not a branch head.21:11
mbwgh: rebase does this.21:11
mbwgh j416 Okay that is reassuring. Thank you.21:11
toothe why do people pay github for hosting their project?21:12
why not just use gitea?21:12
→ Zexaron joined21:12
→ acresearch joined21:13
→ Odyseus joined21:13
j416 convenience and cost savings21:14
GreenJello toothe, I've only ever used github and bitbucket, and I haven't seen a reason to switch21:14
← armyriad left21:14
toothe GreenJello: are you a public project?21:14
or private?21:14
GreenJello I do both21:15
toothe the cost isn't high for github?21:15
GreenJello it's like $7/mo for a personal account with private repos, and $5? per user for an organization with private repos21:16
→ mollusk joined21:16
toothe yeah, i suppose that isn't too high21:16
i vaguely recall it being more expensive21:16
my current client uses github.21:16
← venmx left21:17
← buyfn left21:17
Unode github, gitlab, bitbucket are the main (oldest?) commercial platforms. Advantages include mostly popularity and service integration though the last is somewhat eroding with time.21:17
GreenJello like if you pay someone even $10/hr, that's ~$1,600/mo, so the cost of github is negligible21:18
toothe maybe I'm wrong?21:18
Unode For instance I quite like gitlab for its fully integrated infrastructure and the fact that you can clone the entire infrastructure locally if you so desire.21:18
toothe I don't get its integrations.21:18
But, I also don't do development for a living.21:18
← plexigras left21:18
toothe That stuff confuses me, honestly.21:19
← acresearch left21:19
Unode toothe: it's mostly stuff that react to changes.21:19
toothe Right.21:19
I'd love to learn it someday.21:20
its "hard mode"21:20
GreenJello toothe, github has a very powerful API, and it can do things like notify you of commits or issues created in chat programs like slack, and you can have it display the status of test results when someone is requesting a merge, and so many other things21:20
toothe GreenJello: that's awesome...21:20
can Gitlab do that sorta thing?21:20
→ acresearch joined21:20
Unode it has an API but I'm not familiar with that use-case.21:21
GreenJello I'm not familiar with gitlab, but I imagine they try to keep pace with github21:21
Unode meaning, maybe21:21
mbwgh During a rebase --interactive, if a reset to HEAD~, change something in the staging area and commit (instead of amending the commit I came from), which commit will become the parent of the next one when I `git rebase --continue`?21:22
Unode I think gitlab is moving a bit faster than github. They aim at an all-in-one platform. Github is more of a core with tons of services around from all sorts of companies.21:22
mbwgh *Assuming I start of at a commit marked "edit"21:22
Unode but that said, I'm sure there are things github has that gitlab doesn't and vice-versa21:22
toothe interesting21:23
are these things that can be copywritten?21:23
or patented?21:23
Unode no clue about patents. As for code gitlab has an open-source community edition and some more advanced stuff only for enterprise editions.21:24
toothe rigt21:25
right*21:25
Unode toothe: https://about.gitlab.com/pricing/ gives a short overview.21:26
GreenJello I believe that trying to do too many things is a terrible idea. So, with gitlab CI, you can generally assume that only gitlab users are going to use it, which let's say is 3% of teams, and it's not their primary focus. Compare with travis ci, which gets to focus on CI as their main product, and since it can be used by teams using github or any other system, they're able to put more resources into it21:27
← linuxmodder left21:27
← acresearch left21:28
GreenJello It's an old way of building companies that doesn't make sense in this era21:28
← nowhere_man left21:28
Unode GreenJello: we run gitlab at work on our own infrastructure.21:28
→ nowhereman joined21:29
nowhereman → Guest4797021:29
Unode personally the features I use the most are all present in both platforms. One exception is CI, which github outsourced (travis, etc..)21:30
→ armyriad joined21:30
→ fassl joined21:30
← yoh_ left21:30
GreenJello I'm not saying anything bad about their products specifically, just that they're trying to do a lot while providing the services to a subset of their subset of users, and I'm not sure what the value proposition is21:31
Unode that said it doesn't have all the bells and whistles of say appveyor. but since it runs on docker I can literally replicate the same environment on my own machine and debug locally. Can't do that with Travis which is a time sink of trial-and-error.21:31
→ acresearch joined21:32
GreenJello I generally prefer to self-deploy CI, so I use jenkins, which is also just a CI program, and widely used independent of any other choices you've made21:32
Unode true21:32
cbreak I prefer to let other people do the deployment21:33
Unode anyway, back to my initial question. Does anyone have any suggestion how to figure out what is the best commit to anchor two related but independent repositories?21:33
Also I'd like to rebase the history in the end such that they both appear as linear in their own branches.21:34
toothe: basically read on them, take them for a spin and once you feel like you played enough pick one. There will always be pros and cons.21:35
toothe well...I don't use their advanced features yet21:37
someday I'll move into development...21:37
→ royal_screwup21 joined21:42
royal_screwup21 what's the difference between overwwrite local vs overwrite remote?21:42
← acresearch left21:42
→ Sasazuka joined21:45
← mbwgh left21:46
→ polydo_s joined21:54
← mollusk left21:57
← gitinfo left21:59
→ gitinfo joined22:01
ChanServ set mode: +o22:01
→ sQVe joined22:02
← sh4rm4^bnc left22:05
→ boombatower joined22:09
→ thiago joined22:10
→ yyy- joined22:12
← yyy left22:14
← mikedd left22:16
← jasmith left22:16
→ irc_viewer_test joined22:21
← boombatower left22:21
→ RoriconKnight joined22:28
← cbrt64 left22:28
← irc_viewer_test left22:33
→ cbrt64 joined22:39
← supernov1h left22:44
← dpyro left22:44
→ WolfOrwell joined22:44
← cbrt64 left22:46
← leeN left22:46
→ cbrt64 joined22:47
→ mofai joined22:53
→ sword joined22:57
← mowcat left23:03
← pd09041999 left23:04
← gxt left23:07
← RoriconKnight left23:10
← cbrt64 left23:12
→ mowcat joined23:12
← yyy- left23:15
→ cbrt64 joined23:16
← mofai left23:17
→ Ranhir joined23:22
→ mbwgh joined23:22
mbwgh When you have a master branch with linear history and many small commits, how do you keep track of what the larger purpose of some commit was? The smaller they get, the more "operational" in nature their commit message tend to become, like "Add foo method" or whatever. Should the purpose be part of the commit message? That would yield repetition if commits are small. Or do you use tags? Leave feature bubbles?23:26
← Ranhir left23:26
→ Ranhir joined23:26
mbwgh (This is probably subjective, but I would be interested in opinions)23:27
thiago answer: I don't.23:32
mbwgh thiago: Could you expand on your rationale? I know there's a holy war between merge/rebase groups, but personally I am just asking this from a beginner perspective really.23:35
This may or may not be really about what a good commit message should look like, but I am not sure at this point.23:36
Or my commits are too small23:37
← orbyt_ left23:40
← cbrt64 left23:42
← spacesuitdiver left23:42
→ kadoban joined23:43
→ cbrt64 joined23:43
→ n3wborn joined23:50
→ mollusk joined23:53
→ MACscr joined23:57
← pawle left23:59

Logs Search ←Prev date Next date→ Channels Documentation