IRCloggy #git 2015-11-11

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.

2015-11-11

← ome left00:00
→ mingwandroid joined00:00
← eijk_ left00:01
← seangrov` left00:02
← ac3takwas left00:03
→ gfixler joined00:05
→ lbv-user joined00:06
← LBV_User left00:07
→ durham_ joined00:07
← Es0teric left00:08
← frite left00:08
→ Slyde joined00:10
← durham left00:10
← mischat left00:11
→ hrt joined00:12
→ anth0ny joined00:12
← hrt left00:12
← lindenle left00:12
← Slyde left00:13
← Arsonide left00:13
→ Arsonide joined00:13
→ modocache joined00:14
→ vigintas joined00:14
← nate_c left00:15
← alanwill left00:16
→ wxg joined00:16
→ lindenle joined00:17
← lindenle left00:17
← modocache left00:18
← Ldip left00:18
← peoliye_ left00:20
→ alanwill joined00:20
← tanuck left00:20
→ non_plus_ultra joined00:20
→ jmckind joined00:22
← s8321414 left00:22
→ s8321414 joined00:22
← s8321414 left00:23
→ s8321414 joined00:23
→ devoldmx joined00:23
→ daito joined00:24
→ ac3takwas joined00:24
→ NeverDie joined00:26
← devoldmx left00:28
← daito left00:28
← cbonobo left00:28
← ac3takwas left00:29
→ dopesong joined00:29
→ ahr3n joined00:30
← mingwandroid left00:32
→ darkbit joined00:33
← forbidden404 left00:33
← dopesong left00:34
← italoacasas left00:34
← jteneyck left00:34
← ajacmac left00:34
→ ajacmac joined00:35
← cdown left00:36
← rpdprd left00:37
→ rpdprd joined00:39
maletor after rebasing a branch on top of master, what is the best way to compare the changes you made during your rebase with the changes on origin/branch? basically i want the diff to exclude all the updates that took place in master.00:41
← vigintas left00:42
← jmpp left00:42
thiago maletor: I'm not sure it's possible00:42
maletor thiago: next best thing?00:42
thiago try git diff ...thisbranch@{1}00:42
where "thisbranch" is the name of the current branch00:42
← s8321414 left00:42
→ _cyril_ joined00:43
→ DolpheenDream joined00:43
← _cyril_ left00:48
→ mingwandroid joined00:48
← TobyP_ left00:48
→ latrommi joined00:49
← mikecmpbll left00:49
→ forbidden404 joined00:49
→ hexagoxel joined00:50
← cdg left00:50
← harish left00:51
→ _cyril_ joined00:52
← latrommi left00:54
← ColdKeyboard left00:55
→ peoliye joined00:56
← fracting left00:56
← bvi left00:56
→ ColdKeyboard joined00:57
→ kristjansson joined00:57
← fstd left00:59
→ fstd joined00:59
← kilo_bravo left01:00
← maletor left01:05
← tang^ left01:05
← chitopunk left01:06
← peoliye left01:06
→ cmoneylulz joined01:08
→ govg joined01:08
← ahr3n left01:09
← akiva left01:09
→ jteneyck joined01:09
← jteneyck left01:09
→ jteneyck joined01:09
← durham_ left01:09
→ fracting joined01:09
← Arsonide left01:09
→ Arsonide joined01:10
→ italoacasas joined01:10
→ mac_ified joined01:10
→ durham joined01:10
← darkbit left01:10
← {AS} left01:11
← NeverDie left01:11
→ Technocrat7 joined01:12
← mingwandroid left01:13
→ NeverDie joined01:13
→ ORiON-- joined01:13
→ mingwandroid joined01:14
→ ahr3n joined01:15
← gccostabr left01:15
← linuxmint left01:17
→ lindenle joined01:17
→ daito joined01:18
← non_plus_ultra left01:18
← thiago left01:19
← bb010g left01:20
← cmoneylulz left01:20
← mingwandroid left01:21
← lindenle left01:22
→ kegster joined01:23
← fracting left01:23
→ waspinator_ joined01:23
→ samw joined01:23
→ darkbit joined01:24
→ garples joined01:27
← forbidden404 left01:27
→ jstimm joined01:27
← erichf left01:27
→ otter768 joined01:28
→ forbidden404 joined01:28
← Neozonz left01:28
→ denimsoft joined01:30
← luriv_ left01:30
← timvisher left01:31
→ timvisher joined01:31
← otter768 left01:33
← alanwill left01:35
→ phantombeta joined01:37
→ Neozonz joined01:39
← dreiss left01:40
← eka left01:40
← rpdprd left01:40
← wcypierre left01:41
← dantix left01:41
→ fracting joined01:42
← kristjansson left01:42
→ gopar joined01:44
← Neozonz left01:44
→ MihaiTodor joined01:45
→ Hello71 joined01:47
→ fkm joined01:47
← fracting left01:48
→ wcypierre joined01:49
→ TDJACR joined01:49
← m0viefreak left01:51
← LaptopBrain left01:51
→ fracting joined01:51
← jteneyck left01:51
← SimonNa left01:52
← samw left01:52
← griotspeak left01:52
→ djx joined01:54
← ecmike left01:54
djx hey, I made a 2 commits and I have changes on this one, I only realized now that on HEAD^^ I added 3 files that weren't supposed to be there, how can I move them to the new commit I'm about to make?01:55
→ Neozonz joined01:55
← Neozonz left01:55
→ Neozonz joined01:55
→ paulweb5151 joined01:58
→ ecmike joined01:59
→ latrommi joined01:59
← paulweb515 left01:59
← fracting left01:59
← Neozonz left02:00
→ Sasazuka joined02:01
← imachuchu left02:01
← latrommi left02:03
→ cyphase_ joined02:03
← cyphase_ left02:03
→ cyphase_ joined02:03
Sc0rpius are you the only user on that branch or others are committing as well?02:04
djx Sc0rpius: I'm the only one, this commit hasn't left my PC :-)02:04
Sc0rpius rewriting history is a problem02:05
djx Sc0rpius: I think I screw up things, I did a git rebase SHA^ (I forgot the -i)02:05
Sc0rpius I'd never understand why everybody wants a perfect history.02:05
what's the deal if the files are there 3 commits behind if you are going to make a new commit with them anyway02:05
you just want a perfect history, right?02:06
Eugene Stalin wanted a perfect history02:06
Thus, rebasing is communism02:06
Sc0rpius he failed. Miserably.02:06
Eugene </logic>02:06
djx Sc0rpius: no, the older commit was made but those files don't belong there02:06
→ mablae__ joined02:06
djx I didn't saw the whole list before making the commit02:06
they are new files which only make sense with this new commit02:07
Sc0rpius ok they don't belong there, but why you want to modify it. It's history, it's the past and nobody will go there. In HEAD the files in there.02:07
*are02:07
you just want a perfect history02:07
→ CKyle joined02:07
Sc0rpius and perfect history is painful, very very painful02:08
theskillwithin Is there going to be a major update to git anytime soon?02:08
Sc0rpius because at this point your only solution is to spend hours squashing everything into a single commit and then splitting that commit in several ones the way you want02:08
djx Sc0rpius: no! I want the commits to be tight! if I say in a commit "upgrade X to Y" and later I want to revert that commit I just want to revert THAT commit not foo bar foobar commits02:08
Sc0rpius and then after a week doing that you'd think "hell, I would have saved a week of work just forgetting about this"02:08
← daivyk left02:09
← alex1a left02:09
→ alanwill joined02:09
→ st joined02:10
Sc0rpius I can't think no other way than commit what you have now. Rebase -i, squash the last 3 commits into one. Then rebase -i again and split that commit in again the 3 commits you had, but the way you want02:10
← mablae_ left02:10
Sc0rpius (that will take you several days)02:10
st → Guest6261902:10
→ harish joined02:10
← jmckind left02:10
Sc0rpius I dunno if somebody else here has a better solution...02:10
Sc0rpius looks around, nobody raises their hands02:11
→ rpdprd joined02:11
djx Sc0rpius: I think you didn't understand my problem. I was able to solve it with git rebase -i SHA^ && edit SHA && git rm --cache file1 file2 file3 && git rebase --continue02:11
kadoban theskillwithin: major updates to git tend not to be very exciting. git is pretty ridiculously stable, not a lot changes.02:11
→ Neozonz joined02:11
← Neozonz left02:11
→ Neozonz joined02:11
→ Goplat joined02:12
← MihaiTodor left02:12
→ Vampire0_ joined02:13
Sc0rpius well I guess the next commits didn't had anything to do with those files and you aren't losing important changes to them02:13
← st__ left02:13
→ fracting joined02:13
→ cdg joined02:13
djx Sc0rpius: no, they were new files that were only supposed to be added now (on the commit I'm currently committing)02:14
← jagob left02:14
djx Sc0rpius: now I understand when you wanted to kill me with forks and fire, doing what you're thinking yeah it would be painful02:14
s/when/why02:14
Sc0rpius 99% of the questions here can be summarized as "I don't like my history"02:15
djx lol02:15
← Vampire0 left02:16
djx Sc0rpius: easy; mkdir newRepo && git init && mv oldRepo newRepo && git commit -m "First commit"02:16
fresh history02:16
→ neataroni joined02:16
← Neozonz left02:16
→ Gsham joined02:17
lbv-user Sc0rpius: I may not agree... there is also a high percentage of "I screwed something here..." also :P02:17
→ ncthom91 joined02:17
→ samw joined02:17
← _cyril_ left02:18
→ devinclark joined02:19
← devinclark left02:19
→ devinclark joined02:19
rewt and there's probably an overlap of those... "i screwed something up and now my history isn't clean"02:19
Sc0rpius another common mistake, people think HEAD^ is the same as HEAD~02:19
since very often they are the same02:20
theskillwithin, what do you need in git that currently doesn't have and you want an update?02:20
← samw left02:22
→ _cyril_ joined02:23
← ecmike left02:23
→ nowhere_man joined02:23
djx that's an easy answer: the ability to have a pretty history anytime02:24
← Arsonide left02:24
Sc0rpius hahahaha02:24
← ahr3n left02:26
← gfixler left02:26
Sc0rpius I would love that git wouldn't change the hash of same diffs in different periods of time.02:26
I can ellaborate02:26
I have a branch with a commit with SHA1 behind master02:27
I rebase, then SHA1 becomes SHA202:27
then I push to two different repos, the first one goes ok, the second one needs a push -f.02:27
→ Neozonz joined02:27
Sc0rpius and that irritates me02:27
→ roygbiv joined02:29
→ Arsonide joined02:29
← cdg left02:30
→ cdg joined02:31
← cdg left02:31
→ cdg joined02:32
djx Sc0rpius: ah yeah it looks like you really messed up SHA1! but you didn't02:32
← Neozonz left02:32
← lbv-user left02:33
← ril left02:33
→ lbv-user joined02:33
← lbv-user left02:33
→ LBV_User joined02:33
← ncthom91 left02:36
← pks left02:37
→ pks_ joined02:37
pks_ → pks02:37
← waspinator_ left02:38
← apotry left02:39
← _cyril_ left02:40
→ msonntag joined02:40
→ nyderrn joined02:41
→ Wetmelon joined02:42
→ Neozonz joined02:43
← Neozonz left02:43
→ Neozonz joined02:43
→ samw joined02:45
→ cmoneylulz joined02:46
← cdg left02:47
→ axisys joined02:47
← Neozonz left02:48
← Puhe left02:48
← circa left02:48
← samw left02:49
→ circa joined02:50
← circa left02:50
→ circa joined02:50
→ ril joined02:51
← presto left02:53
← circa left02:53
→ _cyril_ joined02:53
← ril left02:53
→ circa joined02:53
← alanwill left02:53
→ Nizumzen joined02:55
→ tinajohnson joined02:55
← CKyle left02:55
→ alanwill joined02:58
← cmoneylulz left02:58
→ ncthom91 joined02:58
→ ril joined02:59
→ Neozonz joined02:59
→ ilmgb_ joined02:59
← ajacmac left03:00
← Gsham left03:01
← _cyril_ left03:01
← d10n-work left03:03
← circa left03:03
→ MrWoohoo joined03:03
← Neozonz left03:04
← Sasazuka left03:04
← alanwill left03:08
→ samw joined03:12
→ Neozonz joined03:15
→ scarabx joined03:15
← tristanp_ left03:15
→ xcesariox joined03:15
→ tristanp joined03:15
← strayPuppy left03:16
← samw left03:16
→ dsantiago joined03:17
→ jteneyck joined03:18
← jteneyck left03:18
→ jteneyck joined03:18
→ thiago joined03:18
→ latrommi joined03:19
← Neozonz left03:20
← cagedwisdom left03:20
→ cagedwisdom joined03:20
→ craigp joined03:22
← craigp left03:24
← djx left03:25
→ vigilancer joined03:28
→ otter768 joined03:29
→ Gsham joined03:29
→ Cesario joined03:31
→ durham_ joined03:31
→ StuckMojo joined03:32
StuckMojo can someone remind me the config option for status -s and -b ?03:32
want the status to always be -sb03:32
← cagedwisdom left03:32
← timvisher left03:33
→ timvisher joined03:33
← otter768 left03:33
← ncthom91 left03:33
← durham left03:34
← aidalgol left03:35
→ cagedwisdom joined03:35
→ gfixler joined03:35
← durham_ left03:36
→ Motoko joined03:36
→ rchavik joined03:37
StuckMojo nevermind. i see it's in the git-config man page, sorry.03:38
→ samw joined03:39
StuckMojo ciao03:39
← StuckMojo left03:39
← duckmaestro left03:41
→ LaptopBrain joined03:42
← chucky_z left03:43
← CheckDavid left03:43
← samw left03:43
→ jagob joined03:44
theskillwithin Sc0rpius well I always hear that git isn't the best solution, its just the most popular. and I am willing to keep using it for that reason alone. I use the git cli everyday however I am still not totally comfortable in it. rebase conflicts and such03:44
→ circa joined03:44
theskillwithin Seems to me if this is really an issue, that git isn't the best solution it's just the most popular, the answer is quite simple, just update git03:45
Esp considering the chances of me adopting another solution is close to 003:46
deltab best solution for what?03:46
theskillwithin ah I see your point, in order to say its a good solution you have to have context03:47
← daito left03:47
theskillwithin for my personally, I work on Magento sites some times. this gets very involved, I like to have my entire magento site inside a git repo, I then use symbolic links for folders that might be too big but this is aside the point. there are a shit ton of files in magento and things are very delicate, so if something goes wrong I might be completly relying on git because I might not be able to manually undo something03:48
→ samw joined03:49
→ _cyril_ joined03:49
theskillwithin I use the repo to deploy infact, I have a local vagrant, then I make the commits there, push to a dev site placed on a subdomain to make sure it doesn't break anything, then deploy to live03:49
← gopar left03:50
← nvahalik left03:51
→ mwhooker joined03:51
→ peppers joined03:53
← MrWoohoo left03:53
← devinclark left03:53
← ril left03:55
→ ril joined03:56
→ daivyk joined03:56
→ Meow-J joined03:56
← tristanp left03:58
← ribasushi left03:59
→ settermjd joined03:59
← ril left04:00
→ watabou joined04:02
← whitby left04:03
→ ScotTFO joined04:04
→ griotspeak joined04:04
→ mizu_no_oto joined04:06
← samw left04:08
→ ribasushi joined04:08
← Gamecubic left04:09
→ Gamecubic joined04:10
← axelunicorn left04:11
← garples left04:13
← _cyril_ left04:14
→ averageuser joined04:15
→ M4renz-work joined04:16
← s00pcan left04:17
← Gsham left04:18
← M4r3nz-work left04:19
← Phoenixz left04:21
→ Neozonz joined04:21
← mizu_no_oto left04:22
→ variable joined04:22
← fracting left04:24
→ daito joined04:25
← wxg left04:26
← daito left04:29
→ daito joined04:30
← latrommi left04:31
→ sanketdg joined04:33
→ samw joined04:33
← fscala left04:34
→ fscala joined04:36
→ raven-au joined04:37
← samw left04:37
→ Rodya_ joined04:37
→ fairuz joined04:38
← mmlb left04:39
→ kp666 joined04:40
← toothrot left04:40
← kp666 left04:41
← arescorpio left04:41
← fairuz left04:41
→ kp666 joined04:41
→ Vaelatern joined04:42
← kp666 left04:43
→ kp666 joined04:43
← italoacasas left04:44
→ garples joined04:45
→ fracting joined04:45
← kp666 left04:46
→ eka joined04:46
→ kp666 joined04:47
→ lindenle joined04:47
← LaptopBrain left04:47
← scarabx left04:48
→ samw joined04:50
← lindenle left04:50
← mac_ified left04:54
← samw left04:55
← Neozonz left04:55
→ lindenle joined04:55
→ cmoneylulz joined04:58
→ ril joined04:59
← roygbiv left05:00
→ scarabx joined05:02
← dsantiago left05:02
→ ntio joined05:03
→ josuebrunel joined05:04
→ melbatoast joined05:04
→ led_belly joined05:13
← FireArrow133 left05:13
→ stangeland joined05:13
← LBV_User left05:14
→ RockLee joined05:15
← darkbit left05:15
← settermjd left05:15
ril → ril[away]05:16
ril[away] → ril05:16
← daivyk left05:17
← lindenle left05:17
→ lindenle_ joined05:17
→ settermjd joined05:18
→ Neozonz joined05:21
← Neozonz left05:21
→ Neozonz joined05:21
← lindenle_ left05:21
→ Hobbyboy joined05:21
→ dsantiago joined05:23
← themill left05:23
→ lindenle joined05:24
→ devinclark joined05:24
← Neozonz left05:26
→ ayaz joined05:27
← sparetire_ left05:28
← devinclark left05:29
→ otter768 joined05:29
→ themill joined05:30
← cmoneylulz left05:31
→ krabat joined05:32
→ TobyP_ joined05:34
← lindenle left05:34
← otter768 left05:34
→ lindenle joined05:35
→ Qudit314159 joined05:36
→ nilg joined05:36
→ uoun joined05:36
→ _dv_ joined05:36
→ InfoTest joined05:37
← uoun left05:37
← lindenle left05:37
← InfoTest left05:38
→ zapb_ joined05:38
← Technocrat7 left05:38
← settermjd left05:40
→ subscope joined05:45
→ PCatinean joined05:45
→ jceb joined05:45
→ samw joined05:48
← fahadash left05:51
← Gamecubic left05:54
← tpollard left05:56
← TobyP_ left05:59
→ ac3takwas joined05:59
→ InfoTest joined06:00
→ vrishab joined06:03
→ howdoi joined06:03
→ rscata joined06:05
→ daito_ joined06:05
→ t-mart_ joined06:06
→ safe joined06:06
→ rvsjoen_ joined06:06
→ ashka` joined06:07
← ac3takwas left06:07
← sleezd left06:07
→ greymalkin_ joined06:07
→ ketas joined06:07
→ alex1a joined06:07
← daito left06:07
greymalkin_ → greymalkin06:07
→ daito joined06:08
→ sleezd joined06:08
→ _ikke_ joined06:08
→ imack joined06:09
→ ReScO joined06:09
→ maxorator joined06:09
→ mingwandroid joined06:09
→ RichiH joined06:10
← daito_ left06:10
← Guest62619 left06:11
← timvisher left06:11
→ Saturn812 joined06:13
→ timvisher joined06:14
→ User458764 joined06:15
← User458764 left06:15
→ ac3takwas joined06:15
→ User458764 joined06:16
← ac3takwas left06:16
→ free_beard joined06:17
ril → ril[away]06:17
ril[away] → ril06:17
→ MechtiIde joined06:18
→ durham joined06:20
→ adgtl joined06:21
← MaceBewley left06:22
← durham left06:23
→ durham joined06:23
→ git joined06:24
git Hi All.06:24
I have question git.06:25
git → Guest932506:25
Guest9325 Hi all06:25
gitinfo Guest9325: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.06:25
Guest9325 I have question.06:26
→ devoldmx joined06:26
Guest9325 Now I'm using Visual studio with Git.06:26
But I got a problem.06:26
← devoldmx left06:26
→ skorgon joined06:27
Guest9325 I created SQL Project with Visual studio.06:27
So, I pushed to git server to sql project.06:27
But I saw binary files on the git server.06:28
What is problem.06:28
?06:28
→ makenoise joined06:28
→ lettuce joined06:28
→ devoldmx joined06:28
lettuce → Guest9287006:28
Guest9325 I tried to change encoding UTF-8. But it is not working well.06:29
I got a same problem.06:29
→ ivan\ joined06:29
→ ThomasLocke joined06:29
Guest9325 plz...anyone help...b.b06:29
← glebihan left06:31
← peppers left06:31
← Guest92870 left06:32
← subscope left06:32
grawity the Git server has exactly what it needs to have06:33
→ adgtl_ joined06:34
→ nnyk joined06:34
→ glebihan joined06:34
← vigilancer left06:34
Guest9325 @grawity I want to push diff to sql files.06:34
→ pantsman- joined06:35
→ ac3takwas joined06:35
← User458764 left06:36
← adgtl left06:37
← Motoko left06:37
→ adgtl joined06:39
→ lindenle joined06:39
→ checkItOut joined06:40
← ac3takwas left06:41
→ elementalest joined06:41
← adgtl_ left06:42
→ settermjd joined06:42
→ del joined06:43
→ ewet joined06:44
→ ciampix joined06:44
← fracting left06:44
→ latrommi joined06:45
← lindenle left06:45
→ User458764 joined06:47
← mingwandroid left06:47
← variable left06:48
→ MaceBewley joined06:48
→ mingwandroid joined06:49
→ MrWoohoo joined06:49
→ MrWoohoo2 joined06:49
← samw left06:51
← latrommi left06:53
← gniourf left06:54
→ yxejamir joined06:55
→ wxg joined06:56
← User458764 left06:57
→ leeN joined06:58
← settermjd left06:59
→ gopar joined07:00
→ t2mkn joined07:01
→ Xethron joined07:01
→ SapphireTX joined07:01
→ jay-m joined07:01
→ gniourf joined07:01
← josuebrunel left07:02
→ sinkensabe joined07:03
← stangeland left07:03
→ fracting joined07:05
← watabou left07:06
← jceb left07:07
→ DazPetty joined07:08
DazPetty hey, I'm on windows using git and I want to download a project that is 5gig in size, but I have allready downloaded 4.6 gigs seperately07:08
so I want to keep that folder but connet to the repo other wise07:08
so I don't want to redownload everything07:09
→ settermjd joined07:10
← yxejamir left07:10
← makenoise left07:10
kadoban DazPetty: git can't resume clones, so you're kinda screwed, unfortunately.07:10
← MechtiIde left07:11
← ciampix left07:11
DazPetty can't I connect to a repo without downloading from it?07:11
kadoban DazPetty: I don't know what that means.07:12
grawity how exactly did you download those 4.6G previously07:12
← melbatoast left07:12
← scarabx left07:12
→ Moistmelon joined07:13
DazPetty I downloaded it with git clone but the project was missing a few small files07:13
so I want to copy the folder "contents" to a folder and then link that up with the git repo07:13
by just adding the remote origin or somthing07:14
← Wetmelon left07:15
← settermjd left07:15
← ril left07:15
kadoban DazPetty: "but the project was missing a few small files" What files? How do you know they're missing? Did the clone fail or get interupted?07:15
← timthowtdi left07:15
→ timthowtdi joined07:16
← MaceBewley left07:16
grawity rule #2 of irc tech support: describe the situation you're in, *not* the tools you think you need, because they're the wrong tools a lot of the time07:17
← t2mkn left07:18
→ t2mkn joined07:20
→ star_prone joined07:21
kadoban DazPetty: My guesses of what's going on, because I'm heading out: 1) You are just looking at the wrong branch or something and thinking something is wrong. 2) Your clone failed and you're trying to find a wording that's going to make resuming the failed clone possible. It's not, cloning isn't resumable. You could try to hack together a working repo, but it's basically a terrible idea.07:21
→ AustinMatherne joined07:22
→ lb joined07:22
grawity still waiting for "did the clone fail or get interrupted?" here07:23
→ WetLemons joined07:25
← KaibaCorp left07:26
→ youngbaks joined07:27
← jay-m left07:27
→ dopesong joined07:27
← weaksauce left07:27
← Moistmelon left07:27
← gopar left07:30
→ Kulrak joined07:30
← Kulrak left07:30
→ Kulrak joined07:30
→ otter768 joined07:30
→ MaceBewley joined07:31
← dopesong left07:31
→ filisko_ joined07:32
→ dopesong joined07:32
← kadoban left07:33
osse grawity: you can't handle the truth07:33
→ Caius joined07:33
→ weeza joined07:35
← otter768 left07:35
mischief hi, i'm wondering if there is a better way to have all of my feature branches collected together than just checking out some random branch name and cherry-picking all of the features on top of it07:37
→ ac3takwas joined07:37
← jstimm left07:37
→ jstimm joined07:38
→ xaa joined07:39
→ jay-m joined07:40
→ zhangxaochen_ joined07:41
→ daito_ joined07:41
← ac3takwas left07:41
→ ac3takwas joined07:41
→ sorenb joined07:42
← daito left07:43
→ DaddyEric_DESK joined07:43
→ kaiza joined07:43
← DaddyEric left07:44
→ GothAlice joined07:44
← GothAlice left07:44
→ GothAlice joined07:44
→ diesel joined07:44
→ linagee joined07:44
← fracting left07:44
→ zacts joined07:44
→ armyriad joined07:44
→ neunon joined07:44
→ DonVitoCorleone joined07:45
→ fracting joined07:45
→ LilSusieCrabCake joined07:45
→ solomon56 joined07:46
→ wagle joined07:49
→ MeltedLux joined07:50
← fracting left07:51
→ solrize joined07:51
→ nwf joined07:51
solrize hi i have same question as last night, but backwards. if i pull from someone's repo (ok), and then they delete/rebase some files in the repo and then i pull again, does the delete/rebase happen in my mirror too, so i can't get the deleted files back?07:52
skorgon !pull07:54
gitinfo pull=fetch+merge (or with flags/config also fetch+rebase). It is thus *not* the opposite of push in any sense. A good article that explains the difference between fetch and pull: http://longair.net/blog/2009/04/16/git-fetch-and-merge/07:54
skorgon if you pull again, git will actually merge. you will have both, the old and the rebased history in your version07:54
← ac3takwas left07:55
skorgon also check out man git rebase, the section 'recovering from upstream rebase'07:55
gitinfo the git-rebase manpage is available at http://jk.gs/git-rebase.html07:55
← weeza left07:56
← Rodya_ left07:56
→ faux___ joined07:57
→ Domhack_ joined07:57
← Vaelatern left07:58
→ dreiss joined07:59
← SapphireTX left07:59
← pantsman- left07:59
→ vikas027 joined07:59
→ Vaelatern joined08:00
← skyroveRR left08:00
→ rendar joined08:01
→ ki0 joined08:02
→ skyroveRR joined08:02
→ settermjd joined08:04
← cosql left08:04
← nyderrn left08:05
← WetLemons left08:05
← elementalest left08:07
→ subscope joined08:07
→ elementalest joined08:07
→ indieross joined08:08
thiago solrize: if you use code that is getting rebased, you have to be VERY careful08:09
→ zeroed joined08:09
thiago solrize: the rule of thumb is: don't use it08:09
solrize: wait until it stops rewriting history before you include it into your sources08:09
solrize: note that usually pulling such a branch means "ok, done, please stop modifying it; delete it"08:09
solrize well the actual scenario is i'm using git as a backup system for some text files and i'm imagining an attacker taking over the origin system which is less secure than i hope that the backup machine is08:10
thiago non-existent scenario08:10
solrize i.e. updates are pushed into a repo on the origin system, and then the backup pulls them08:10
is this a dumb idea?08:10
thiago if you keep the SHA-1 of the last commit, you'll know whether the repository is corrupt08:10
therefore, you can easily identify a compromised repository and you won't use it08:11
solrize well if there is a rebase then that gets rolled back?08:11
hmm or do you mean check the sha before pulling? hmm08:11
thiago re-merging a branch that got rebased will cause all sorts of weird issues08:11
I will not predict what will happen. Instead, you will simply not do that.08:11
→ fracting joined08:12
solrize ok it sounds like the idea isn't so good.08:12
→ _cyril_ joined08:12
solrize oh well08:12
← afuentes left08:12
solrize i can probably come up with some dumb hack instead thanks08:12
← MattMaker left08:13
→ TomyWork joined08:13
→ nafg joined08:13
← durham left08:13
← skorgon left08:15
→ ac3takwas joined08:16
← oojacoboo left08:16
← ac3takwas left08:16
→ psopacua joined08:16
← ayaz left08:16
→ mithenks joined08:16
→ oojacoboo joined08:16
← dopesong left08:17
→ dopesong joined08:17
← MaceBewley left08:18
← safe left08:19
→ adgtl_ joined08:19
→ afuentes joined08:19
← dopesong left08:20
→ jrahmy joined08:20
← neataroni left08:20
← InfoTest left08:21
← t2mkn left08:21
← happy-dude left08:21
→ ayaz joined08:21
→ go1111111 joined08:22
→ dopesong joined08:23
← adgtl left08:23
← faux___ left08:24
→ adgtl joined08:24
← timvisher left08:24
→ timvisher joined08:24
← dopesong left08:25
→ Krotikx joined08:25
→ dopesong joined08:26
← jagob left08:26
← dopesong left08:27
← adgtl_ left08:27
→ adgtl_ joined08:28
→ dopesong joined08:28
← Domhack_ left08:30
← Domhack left08:30
→ RaceCondition joined08:30
→ Balliad joined08:30
→ MaceBewley joined08:31
← adgtl left08:32
→ ni431 joined08:32
→ negaduck_ joined08:33
← govg left08:33
← negaduck left08:34
→ stangeland joined08:37
← kaiza left08:38
← oojacoboo left08:38
← Goplat left08:38
← jrahmy left08:38
→ asdofindia joined08:39
← ayaz left08:40
alexander__b → bernalex08:40
← maxorator left08:40
→ maxorator joined08:42
→ dimi1947 joined08:43
← dreiss left08:43
→ cerkauskas joined08:44
→ doener joined08:44
→ marienz joined08:45
→ oojacoboo joined08:46
→ {AS} joined08:47
→ User458764 joined08:48
→ Hounddog joined08:48
← wxg left08:48
← _cyril_ left08:49
→ wxg joined08:49
← subscope left08:52
→ kurkale6ka joined08:53
← Arsonide left08:53
→ Arsonide joined08:53
→ neanderslob_ joined08:55
← Hounddog left08:55
→ Hounddog joined08:55
← adgtl_ left08:55
→ adgtl joined08:56
→ Rodya_ joined08:57
→ katherine joined08:57
← raven-au left08:57
→ raven-au joined08:58
→ abose joined08:59
← denimsoft left08:59
→ nfk|laptop joined08:59
← adgtl left09:00
← armyriad left09:00
← wxg left09:00
→ cosql joined09:00
← nnyk left09:01
← oojacoboo left09:01
→ mkoskar joined09:01
← checkItOut left09:01
← thiago left09:01
→ mikecmpbll joined09:02
← Rodya_ left09:03
← Krotikx left09:03
abose when migrating from svn to git should I use "--no-metadata", half the tutorials on the web use it and half don't09:04
→ adgtl joined09:05
→ Kicer86 joined09:05
→ shiriru joined09:06
← circa left09:06
← User458764 left09:06
← zeroed left09:07
→ zeroed joined09:08
→ subscope joined09:08
← adgtl left09:08
→ PeterBooker joined09:09
→ marcogmonteiro joined09:10
← youngbaks left09:11
→ Raging_Hog joined09:12
→ boushi joined09:14
← garples left09:14
→ sarri joined09:16
→ adgtl joined09:16
→ joseph_86 joined09:17
← harish left09:17
→ modocache joined09:17
→ encod3 joined09:18
← adgtl left09:19
← Kicer86 left09:19
← Guest9325 left09:21
← modocache left09:22
→ Kicer86 joined09:23
→ eijk_ joined09:23
→ youngbaks joined09:25
→ vigintas joined09:25
→ wxg joined09:27
→ non_plus_ultra joined09:29
→ __marco joined09:30
__marco Good morning. How git-format-patch choose the From field?09:31
→ otter768 joined09:31
__marco Am I right if I assume that sendmail.from override the From field when I use git-send-email?09:32
← non_plus_ultra left09:32
→ yxejamir joined09:33
→ solvaring joined09:33
← d4rklit3 left09:33
→ macrover joined09:33
← howdoi left09:34
← otter768 left09:36
→ liamonade joined09:39
→ br0kenman joined09:40
← neanderslob_ left09:40
← daito_ left09:40
→ howdoi joined09:40
→ neanderslob joined09:42
→ sssilver joined09:43
← evie_hammond left09:44
tobiasvl abose: http://stackoverflow.com/questions/8333870/is-there-an-advantage-to-using-no-metadata-in-git-svn-clone09:45
→ exarch joined09:45
← subscope left09:46
← negaduck_ left09:46
→ acbg joined09:47
→ tanuck joined09:48
← acbg left09:48
← gniourf left09:48
← tanuck left09:49
→ acbg joined09:49
→ tanuck joined09:50
→ zequence joined09:51
← acbg left09:51
→ gniourf joined09:51
← zequence left09:51
← solvaring left09:52
abose tobiasvl: this is the opposite of whats recommended on the offical git migration page , https://git-scm.com/book/en/v2/Git-and-Other-Systems-Migrating-to-Git09:53
→ tanuck_ joined09:53
abose I'm guessing the only difference is the extra meta line09:53
which can only help me if I want to go back/forth to svn/git, if I understand correctly09:53
tobiasvl abose: I don't see that it says --no-metadata is recommended on that page, it just says that you can pass it if you want09:54
abose I think I'll leave the meta data.09:54
← vigintas left09:54
← hexagoxel left09:54
abose regardless, is the only downside the extra line in the commit messages09:55
→ vigintas joined09:56
→ SimonNa joined09:57
→ ramsub08 joined09:57
→ tanuck__ joined09:57
← tanuck left09:57
← tanuck_ left09:57
← youngbaks left09:58
→ AAoK joined09:58
→ subscope joined09:58
→ evie_hammond joined09:58
← ramsub07 left09:59
→ Rodya_ joined09:59
→ stamina joined10:00
← nfk|laptop left10:01
← Cesario left10:01
← neanderslob left10:03
← katherine left10:04
← Rodya_ left10:04
→ jost joined10:04
→ strk joined10:07
→ nfk|laptop joined10:07
strk how do I remove a submodule ?10:07
→ neanderslob joined10:07
→ adgtl joined10:07
strk there's "add" but no "del" ?10:07
← adgtl left10:08
→ tarkus joined10:08
ni431 so if i create a new file in a git directory and use the git status command on it. what will the git status say about the file?10:09
→ josuebrunel joined10:11
← nafg left10:12
→ s8321414 joined10:12
→ nnyk joined10:12
→ Cesario joined10:12
Qudit314159 ni431: Why not try it and see?10:12
ni431 because i don't have any of my stuff on my phone10:13
osse ni431: listed under "Untracked files:"10:13
→ solvaring joined10:13
ni431 okay, that what i was thinking it would say10:14
← ki0 left10:15
→ ki0 joined10:16
→ zequence joined10:16
← MaceBewley left10:17
← averageuser left10:19
→ ShalokShalom joined10:20
→ tcurdt joined10:21
ShalokShalom hi there :)10:21
→ hanthings joined10:21
osse ShalokShalom: salaam aleykum10:22
ShalokShalom please can anyone give me the exact command, how to use git-describe in order to find the git log of a specific commit ?10:22
aleykum salaam :)10:22
→ rnsanchez joined10:22
ShalokShalom "We use git, but don't be a git" ^-^10:23
Now with more indirect cycling giraffes ? :D10:23
My English seems to be still very basic :P10:23
→ WAAQOAM joined10:24
ShalokShalom i aim to get info about such a commit: https://github.com/dolphin-emu/dolphin/commit/8e33891593b2417ec94528f9b53b0df5b4bb820c10:24
← jstimm left10:24
→ oojacoboo joined10:26
← hanthings left10:28
← jay-m left10:28
→ jay-m joined10:28
ShalokShalom ah, i mean git-log instead git-describe, sorry10:29
→ hexagoxel joined10:31
← mingwandroid left10:32
← ki0 left10:32
→ ki0 joined10:32
← vrishab left10:33
← oojacoboo left10:33
→ InfoTest joined10:35
← ShalokShalom left10:35
→ ShalokShalom joined10:36
← neanderslob left10:37
← macrover left10:37
→ mischat joined10:38
→ negaduck joined10:38
→ jost_ joined10:38
← mischat left10:39
_ikke_ ShalokShalom: That's a reference to Direct Acyclyc Graph, the way git structures it's data10:40
→ mischat joined10:40
_ikke_ Acyclic10:40
ShalokShalom huh?10:40
anyway, i found another way now :)10:40
← timvisher left10:40
ShalokShalom i aimed to find specific info about this commit10:40
→ Zariel joined10:41
← Zariel left10:41
→ timvisher joined10:41
ShalokShalom with the usage of git-log10:41
→ mingwandroid joined10:41
→ neanderslob joined10:41
→ daito joined10:41
→ Zariel joined10:41
← Zariel left10:41
← jost left10:42
→ lindenle joined10:42
→ mezod joined10:42
→ Zariel joined10:42
← lindenle left10:42
→ lindenle joined10:42
← neanderslob left10:44
← lindenle left10:45
→ lindenle joined10:45
← daito left10:46
→ Anticom joined10:48
→ checkItOut joined10:49
← Zariel left10:49
← wxg left10:49
← fracting left10:49
→ sross07 joined10:50
← lindenle left10:51
→ InfoTest1 joined10:52
← dimi1947 left10:52
← solvaring left10:52
← Hounddog left10:53
← subscope left10:53
→ subscope joined10:53
← InfoTest left10:55
→ Hounddog joined10:55
← [lewellyn] left10:55
→ [lewellyn] joined10:56
← InfoTest1 left10:56
→ achadwick joined10:57
→ Imaginativeone joined10:58
← star_prone left10:58
→ dantix joined10:58
→ InfoTest joined10:58
→ petersr joined10:59
← checkItOut left10:59
← Hounddog left10:59
→ Hounddog joined11:00
→ Neozonz joined11:00
→ star_prone joined11:01
← petersr left11:02
← dsdeiz left11:02
← Hounddog left11:03
→ Hounddog joined11:03
→ hanthings joined11:05
← Neozonz left11:05
← Hounddog left11:06
→ Hounddog joined11:06
→ FernandoBasso joined11:08
← Hounddog left11:08
→ Hounddog joined11:08
→ jknetl joined11:08
→ youngbaks joined11:09
← ki0 left11:09
← youngbaks left11:10
→ ki0 joined11:10
← Hounddog left11:10
→ Hounddog joined11:10
→ youngbaks joined11:10
→ fracting joined11:11
← Hounddog left11:13
→ Hounddog joined11:13
← mingwandroid left11:13
← subscope left11:14
← s8321414 left11:15
← Hounddog left11:15
→ Hounddog joined11:15
← DazPetty left11:15
→ Neozonz joined11:16
← Neozonz left11:16
→ Neozonz joined11:16
← Hounddog left11:17
→ Hounddog joined11:18
→ juvenal joined11:18
→ oded joined11:19
← Hounddog left11:19
← leeN left11:20
→ Zariel joined11:21
→ CentaurWarchief joined11:21
← Neozonz left11:21
→ GT4066 joined11:21
→ Hounddog joined11:22
→ boushi_ joined11:23
← Hounddog left11:24
← DaddyEric_DESK left11:25
← dopesong left11:26
→ Hounddog joined11:26
→ Error404NotFound joined11:27
← boushi left11:27
→ dharrigan joined11:27
→ ki0_ joined11:27
← youngbaks left11:28
→ ssarah joined11:29
← ki0 left11:30
← shiriru left11:32
← Radivarig left11:32
← abose left11:32
→ otter768 joined11:32
→ Neozonz joined11:32
→ dopesong joined11:33
← Hounddog left11:33
→ andrybak joined11:34
→ skirk joined11:35
andrybak hello, where should i report (or maybe even send a patch) issues in Documentation?11:35
particularly, https://github.com/git/git/blob/master/Documentation/git.txt is not very consistent in the way it refers to Environment Variables11:36
jast to the mailing list. !list11:36
gitinfo [!mailing_list] The mailing list can be reached via [email@hidden.address] You don't need to subscribe to the list, you will always be put in cc on reply. Read archives at http://j.mp/gitlist11:36
andrybak some are enclosed in single suEnvironment Variables11:37
← otter768 left11:37
← Balliad left11:37
→ Hounddog joined11:37
andrybak * some are enclosed in single quotes, some in `` (how are these called?), some are not enclosed in anything11:37
← Neozonz left11:37
→ Radivarig joined11:37
jast they're commonly called backticks11:37
andrybak jast thanks11:38
← StuartMI left11:38
jast at least in programming contexts11:38
→ wolog joined11:38
← alex1a left11:39
_ikke_ Make sure you read the sending patches documentation11:39
→ Balliad joined11:39
andrybak how to check if somebody already fixed it? do i need to check branch maint, next, pu or all of them?11:39
jast stuff like this should get merged to master pretty quickly, if it's not there already I'd maybe check next, too11:40
(master = more or less stable, upcoming release; next = stuff planned for inclusion in master, pu = potentially really broken stuff being worked on)11:41
← Hounddog left11:43
→ Hounddog joined11:43
→ dv_ joined11:44
← cerkauskas left11:45
← _dv_ left11:45
→ CheckDavid joined11:46
→ daivyk joined11:46
→ Rodya_ joined11:47
← wolog left11:47
→ Neozonz joined11:48
← Hounddog left11:49
→ dimi1947 joined11:50
→ Hounddog joined11:51
← Rodya_ left11:51
← josuebrunel left11:52
← Cesario left11:53
→ tomog999 joined11:53
← Neozonz left11:54
→ s00pcan joined11:54
→ naxgid joined11:54
→ adgtl joined11:54
→ vigilancer joined11:56
→ mellernoia joined11:56
→ linduxed joined11:59
→ wxg joined12:02
← wxg left12:02
→ wxg joined12:03
→ darkbit joined12:03
← Kicer86 left12:04
→ Neozonz joined12:04
→ bongjovi joined12:04
→ subscope joined12:04
→ norberhuis joined12:08
norberhuis How can I squash commits on a branch to a single commit when I forward integrated to that branch? So commits from the master branch are present, but I would want to "ignore" these?12:09
← Neozonz left12:09
→ tlaxkit joined12:10
→ Kicer86 joined12:10
→ bollullera joined12:11
← fracting left12:14
→ fracting joined12:15
grawity you definitely wouldn't12:16
andrybak git rebase -i master # delete lines with commits you want to ignore ; (git will add a short commented manual in the end of file)12:16
grawity it's sometimes done when merging a feature into master, but doesn't make sense when going the other direction12:16
→ adgtl_ joined12:18
← Anticom left12:18
← settermjd left12:18
← fracting left12:19
← DolpheenDream left12:19
norberhuis Andrybak: thanks! that works12:20
→ Neozonz joined12:20
→ AndC_ joined12:20
← naxgid left12:21
norberhuis grawity: I am fixing the commits on a feature branch to a single commit to merge back to master.12:21
← adgtl left12:21
norberhuis But I forward integrated into the feature branch and If I try to rebase I get those commits aswell.12:21
→ King_Hual joined12:22
← King_Hual left12:22
→ King_Hual joined12:22
← cagedwisdom left12:23
← bongjovi left12:23
andrybak norberhuis pick the first feature commit, delete integrated commits, squash other commits, if commits made after integration will conflict, rebase will tell you, use `git status` to check if conflicts are resolved12:23
← adgtl_ left12:24
← vigilancer left12:24
→ nopf joined12:25
← Neozonz left12:25
← kp666 left12:26
→ settermjd joined12:27
→ mischat_ joined12:31
→ discipline joined12:31
← norberhuis left12:31
→ fracting joined12:32
← ni431 left12:32
→ roygbiv joined12:32
→ lindenle joined12:33
← JanC left12:33
→ bitkiller joined12:34
→ shiriru joined12:34
← vikas027 left12:34
← mischat left12:35
→ mizu_no_oto joined12:35
→ Neozonz joined12:36
← Neozonz left12:36
→ Neozonz joined12:36
← Radivarig left12:36
← bdadson left12:37
→ nvahalik joined12:37
← lindenle left12:37
→ sdothum joined12:38
→ adgtl joined12:40
← Neozonz left12:41
→ alebeta joined12:41
← jay-m left12:41
→ daito joined12:42
→ jay-m joined12:44
→ Darcidride joined12:45
← daito left12:47
→ JanC joined12:48
→ dsdeiz joined12:48
→ Rodya_ joined12:48
→ [UPA]Stefan joined12:49
→ jstimm joined12:50
← AndC_ left12:50
→ josuebrunel joined12:51
→ yqt joined12:51
← jay-m left12:51
→ Neozonz joined12:52
→ jay-m joined12:52
← Rodya_ left12:52
← fracting left12:53
← Xethron left12:54
→ adgtl_ joined12:55
→ luriv joined12:55
← [UPA]Stefan left12:56
→ devinclark joined12:56
← paulweb5151 left12:56
← fscala left12:56
→ CKyle joined12:56
← Neozonz left12:57
→ fscala joined12:58
← darkbit left12:58
← adgtl left12:58
→ Xethron joined12:58
← fstd left12:59
→ fstd joined12:59
→ ivan_on_trac joined12:59
← Zariel left13:00
← wxg left13:00
→ endiruna joined13:01
← devinclark left13:01
ivan_on_trac when I do, "git push mybranch" to git freezes in "Total 45 (delta 28), reused 0 (delta 0)"13:01
← mizu_no_oto left13:03
← alebeta left13:03
→ t4nkd joined13:05
→ presto joined13:05
→ alebeta joined13:06
→ fracting joined13:06
→ cerkauskas joined13:06
→ vikas027 joined13:07
← negaduck left13:07
→ haaja joined13:08
→ Neozonz joined13:08
← Neozonz left13:08
→ Neozonz joined13:08
← timvisher left13:09
→ timvisher joined13:09
→ slentzen joined13:09
→ bongjovi joined13:11
← __marco left13:11
← Neozonz left13:13
← t4nkd left13:13
→ jml32ljl2 joined13:13
→ Internet13 joined13:13
← elementalest left13:14
→ krawchyk joined13:15
← nnyk left13:17
jml32ljl2 how can i ensure 80 chars on each line for my markdown, `README.md` - https://raw.githubusercontent.com/jeff1evesque/machine-learning/master/README.md?13:17
→ synthroid joined13:18
bremner jml32ljl2: that's more a question for your text editor?13:18
strk fmt README.md13:19
→ modocache joined13:20
← adgtl_ left13:20
→ adgtl joined13:20
bremner yeah, but markdown is pretty sensitive to whitespace and indentation, so any automatic reformat is a bit perilous.13:22
→ iv4nnunes joined13:22
bremner anyway, nothing to do with git per se.13:23
← modocache left13:24
→ Neozonz joined13:24
nfk|laptop i forgot, how do i delete a remote branch?13:25
→ Zariel joined13:26
nfk|laptop just doing branch -dr foo only removes the tracking ref or whatever locally but the branch is still there13:26
strk git push remote_name :remote_branch_name13:26
← Zariel left13:26
strk nfk|laptop: ^13:26
← ivan_on_trac left13:26
nfk|laptop oh, right, thanks13:26
bremner or push --delete, in non-prehistoric git versions13:26
← josuebrunel left13:26
→ Zariel joined13:27
strk is 1.9.1 prehistoric ?13:27
bremner apparently.13:27
I didn't realize push --delete was so recent.13:27
→ DolpheenDream joined13:28
→ valeriansaliou joined13:28
→ elementalest joined13:28
← valeriansaliou left13:28
strk 1.9.1 does support it, looks like -- fatal: --delete doesn't make sense without any refs13:28
← DolpheenDream left13:28
← devoldmx left13:28
← alebeta left13:29
← Neozonz left13:29
← Zariel left13:30
ilmari strk: you need to tell it which branches to delete13:30
git push remotename --delete branchname13:30
→ tvw joined13:30
strk yes thanks, I was just checking if it was supported :)13:30
→ Zariel joined13:31
← rchavik left13:31
← Zariel left13:31
→ Zariel joined13:32
← Nizumzen left13:33
→ otter768 joined13:33
← jost_ left13:34
→ jost joined13:34
→ negaduck joined13:35
→ lindenle joined13:35
→ dstarh joined13:36
→ sgambino joined13:36
← dstarh left13:36
→ lykinsbd joined13:38
← otter768 left13:38
→ harish joined13:38
→ Gamecubic joined13:38
→ uri_ joined13:39
← lindenle left13:40
→ Neozonz joined13:40
← Neozonz left13:40
→ Neozonz joined13:40
→ joseph_8_ joined13:41
← joseph_86 left13:41
← sssilver left13:42
skirk → StuartMI13:42
← RaceCondition left13:42
← Arsonide left13:43
→ paulweb515 joined13:43
→ Arsonide joined13:43
← vigintas left13:43
← slentzen left13:43
← CKyle left13:44
← Neozonz left13:45
← cerkauskas left13:45
→ Ahmed90 joined13:45
← jstimm left13:45
→ vigintas joined13:46
→ mac_ified joined13:46
← SimonNa left13:46
← sgambino left13:47
→ latrommi joined13:47
andrybak i made a fork on github after i cloned the original repo. how to set up my local repo so that `git fetch` by default fetches original, but `git push` by default pushes to my fork?13:47
← mwhooker left13:48
→ forthejest joined13:48
← paulweb515 left13:48
→ tg joined13:48
→ aard_ joined13:49
→ Rodya_ joined13:49
← jteneyck left13:49
→ josuebrunel joined13:50
→ macrover joined13:50
strk andrybak: while I'm sure there's a way, wouldn't it be simpler for you to make your modifications in a different branch ?13:51
→ circa joined13:51
← forthejest left13:51
→ dviola joined13:51
→ forthejest joined13:53
← lykinsbd left13:54
← Rodya_ left13:54
← subscope left13:54
→ freimatz joined13:54
← Ahmed90 left13:54
→ sgambino joined13:55
→ lykinsbd joined13:55
→ Neozonz joined13:56
← elementalest left13:57
→ acti0nma_ joined13:59
← Neozonz left14:01
← bsanford left14:01
← aard_ left14:01
→ paulweb515 joined14:02
→ italoacasas joined14:02
→ rnsanchez_ joined14:02
→ elementalest joined14:03
→ nafg_ joined14:03
← elementalest left14:03
→ elementalest joined14:03
→ _D-Boy_ joined14:04
← dsdeiz left14:04
→ livingstn joined14:04
→ cerkauskas joined14:05
→ abh joined14:07
← bongjovi left14:07
→ MarkyC joined14:07
→ bongjovi joined14:08
← jml32ljl2 left14:08
← Xethron left14:08
← jay-m left14:08
← dimi1947 left14:08
← CheckDavid left14:08
← rnsanchez left14:08
← mkoskar left14:08
← doener left14:08
← MeltedLux left14:08
← neunon left14:08
← Caius left14:08
← Qudit314159 left14:08
← ilmgb_ left14:08
← anth0ny left14:08
← oremanj left14:08
← nyuszika7h left14:08
← eggoez left14:08
← kirjs__________ left14:08
← stfn left14:08
← D-Boy left14:08
_D-Boy_ → D-Boy14:08
→ youngbaks joined14:08
← FernandoBasso left14:09
→ mbrzuzy joined14:09
← ewet left14:09
→ nyuszika7h joined14:09
← Zariel left14:10
strk is git http-backend needed at all for a purely public access to a repo ?14:11
or could the repo just be made reachable by the web server ?14:11
→ BtbN joined14:11
→ a3Dman joined14:11
→ Neozonz joined14:12
rom1504 andrybak: git remote set-url origin --push <remote_of_your_fork>14:12
(or edit the .git/config file directly)14:12
but yeah strk is right14:13
→ subscope joined14:13
← nafg_ left14:13
andrybak rom1504 strk thanks, i made a patch file and redid the commit in new branch14:14
→ mischat joined14:14
→ leeN joined14:15
→ Xethron joined14:15
→ jay-m joined14:15
→ dimi1947 joined14:15
→ mkoskar joined14:15
→ doener joined14:15
→ MeltedLux joined14:15
→ neunon joined14:15
→ Caius joined14:15
→ Qudit314159 joined14:15
→ ilmgb_ joined14:15
→ anth0ny joined14:15
→ oremanj joined14:15
→ eggoez joined14:15
→ kirjs__________ joined14:15
→ stfn joined14:15
→ Tee_Pee joined14:15
→ blackwell joined14:15
→ Nevik_ joined14:15
→ deed02392 joined14:15
→ PotatoTrumpet joined14:15
→ apotry joined14:15
← eggoez left14:16
→ Gsham joined14:16
→ bsanford joined14:16
← Neozonz left14:17
→ eggoez joined14:17
→ Guest96383 joined14:17
← mischat_ left14:18
→ dfrank joined14:18
→ kpease joined14:20
→ beoj joined14:20
→ skirk joined14:20
← beoj left14:21
dfrank hi guys. A question about rebase. situation: I've done some work on master, and then I decided that I'd better do this work on another branch instead. So I did: "git checkout parent-of-my-first-change-on-master", then created new branch: "git checkout -b my_new_feature_branch", then go to my latest change on master: "git checkout master", then try to replay all these changes on my feature branch: "git rebase my_new_feature_branch". However, I got: "Current branch14:21
→ diego1 joined14:21
j416 dfrank: you're overcomplicating it14:21
dfrank: does your current master reflect what you wanted to be doing in a separate branch?14:22
dfrank j416: yes14:22
← dviola left14:22
j416 dfrank: in that case, just create a new branch from that: git branch newbranch14:22
dfrank: then reset master to whatever state you want master to be in: git reset --hard somecommit14:23
be sure to have everything committed before and don't forget !backup just in case14:23
gitinfo Worried about your data while trying stuff out in your repo? The repository in its entirety lives inside the .git directory in the root of your work tree so to backup everything `cp -a path/to/workdir path/to/backup` or equivalent will suffice as long as the repo is not modified during backup. See also http://sethrobertson.github.com/GitBestPractices/#backups14:23
← StuartMI left14:23
→ ncthom91 joined14:23
j416 dfrank: "git branch foo" is the same as "git checkout -b foo" except the former does not checkout the branch14:23
dfrank j416: oh, and that's it. Sounds pretty easy, thank you so much. Let me try..14:23
← diego1 left14:24
→ diego1 joined14:24
j416 dfrank: or rather, "git checkout -b foo" == "git branch foo && git checkout foo"14:24
diego1 → dviola14:24
← circa left14:24
j416 dfrank: branches are pointers to commits, "git branch" creates new pointers, "git reset" can move pointers.14:24
linuxmodder → linuxmodder__LIS14:25
linuxmodder__LIS → linuxmodder|LISA14:25
→ The_Phoenix joined14:25
→ circa joined14:26
dfrank j416: it worked perfectly. Thanks again!14:27
j416 great! you're welcome14:27
→ Neozonz joined14:28
← jknetl left14:28
→ alex1a joined14:28
→ mattmart joined14:28
→ cdg joined14:29
→ devoldmx joined14:29
← bsanford left14:29
← nvahalik left14:29
← cdg left14:30
← mattmart left14:32
dfrank j416: and additional thanks for the explanation. Could you btw elaborate on why rebase in my example didn't work? From what I know, it should replay all changes from the current branch on another one (from the point they were diverged)14:33
← Neozonz left14:33
→ cbonobo joined14:34
dfrank but it just returned "Current branch master is up to date"14:34
→ pozitron joined14:34
← devoldmx left14:34
→ cdg_ joined14:34
← ncthom91 left14:34
← stangeland left14:36
← ramsub08 left14:36
→ bsanford joined14:37
j416 dfrank: I didn't get your full message and I didn't understand the exact situation hm14:37
→ erichf joined14:38
← ItSANgo left14:38
dfrank j416: ok, well, nevermind then. Will try to figure that out when I have to. :)14:39
← Gsham left14:39
← jay-m left14:40
→ aranea joined14:41
← forthejest left14:41
→ jay-m joined14:41
← youngbaks left14:41
← bsanford left14:42
→ mizu_no_oto joined14:42
→ daito joined14:43
→ bsanford joined14:43
→ jml32ljl2 joined14:44
→ Neozonz joined14:44
← dopesong left14:44
← pozitron left14:46
→ CKyle joined14:47
← daito left14:47
← jay-m left14:47
← fracting left14:48
← Neozonz left14:48
← uri_ left14:49
← jml32ljl2 left14:49
→ jay-m joined14:50
→ Rodya_ joined14:50
→ IrishPrime joined14:50
← alex1a left14:51
→ jml32ljl2 joined14:52
→ jstimm joined14:52
← TimDix left14:52
← ShalokShalom left14:53
→ chitopunk joined14:53
← yqt left14:55
← Rodya_ left14:55
← RockLee left14:55
← jstimm left14:57
← free_beard left14:57
← marcogmonteiro left14:58
← cdg_ left14:58
→ jstimm joined14:58
← cbonobo left14:59
→ Neozonz joined15:00
→ tristanp joined15:00
→ lindenle joined15:00
Remram Is there a way to make `push -f` be push `--force-with-lease`?15:00
→ fracting joined15:00
← rscata left15:01
→ troulouliou_div2 joined15:01
andrybak dfrank you tried to rebase from master to parent-of-your-first-change, which (if it worked) just replayed the commits made in master on top of your_new_feature_branch15:02
← negaduck left15:02
andrybak dfrank but it didnt work, git said "Current branch"15:03
→ ItSANgo joined15:03
andrybak dfrank no need to rebase "a-b-c-d" on top of "a-b", it already is on top of "a-b"15:03
→ AaronMT joined15:03
← livingstn left15:03
→ phaleth joined15:03
→ Technocrat7 joined15:04
← tristanp left15:04
← josuebrunel left15:04
← Neozonz left15:05
→ johtso joined15:05
andrybak dfrank the main issue is still to move branch master to the commit you need; which `git reset --hard` is for15:05
← nfk|laptop left15:06
← Saturn812 left15:06
← settermjd left15:07
→ dancinggrass joined15:07
→ garples joined15:08
→ lubarch joined15:08
→ marcogmonteiro joined15:09
← lubarch left15:09
→ nemix joined15:11
→ StuartMI joined15:12
→ kadoban joined15:13
→ cbonobo joined15:13
→ ilmgb joined15:13
→ ril joined15:14
→ guampa joined15:15
← Raging_Hog left15:15
← skirk left15:15
→ Neozonz joined15:16
← Neozonz left15:16
→ Neozonz joined15:16
← ilmgb_ left15:17
→ chuchunaku joined15:17
→ modocache joined15:17
← phantombeta left15:18
← InfoTest left15:18
← byteflame left15:19
→ monthy joined15:19
→ negaduck joined15:20
→ byteflame joined15:20
← Neozonz left15:20
← cbonobo left15:20
→ heroux joined15:20
→ tristanp joined15:21
→ anth0ny_ joined15:21
← dimi1947 left15:21
→ cbonobo joined15:21
← anth0ny left15:21
→ phantombeta joined15:22
→ neonalpine joined15:22
→ alebeta joined15:22
alebeta Hello friends!! good day! i have a short question. How i can delete a specific commit from a specific file? actually i create a script to get the commit hash that i want, but know i need a command for delete this commit15:23
thanks!15:23
kadoban alebeta: You want to delete a commit from a file? What … does that mean?15:25
bremner maybe !revert15:25
gitinfo That's a rather ambiguous question... options: a) make a commit that "undoes" the effects of an earlier commit [man git-revert]; b) discard uncommitted changes in the working tree [git reset --hard]; c) undo committing [git reset --soft HEAD^]; d) restore staged versions of files [git checkout -p]; e) move the current branch to a different point(possibly losing commits)[git reset --hard $COMMIT]?15:25
strk alebeta: git rebase -i <yourcommit>^15:27
and delete the first line, save and exit, cross fingers -- ensure to have a backup15:28
→ adamTPM joined15:28
strk man git-rebase15:28
gitinfo the git-rebase manpage is available at http://jk.gs/git-rebase.html15:28
alebeta yes sorry for my bad explanation, is because im new in this topic, and i need delete the old commits, older than 6 month, because this take some space15:28
→ Noldorin joined15:29
→ Phoenixz joined15:29
alebeta ok strk bremner kadoban thanks15:29
rebase should work then?15:29
← chuchunaku left15:30
bremner uh. I think you want to rather squash commits together. But it's probably not worth the problems it will cause you.15:30
strk alebeta: assuming all the subsequent commits do not depend on that one15:31
← cerkauskas left15:31
strk in which case you'll have to reasolve every single conflict15:31
bremner and that this history is not shared with other people15:31
← shiriru left15:31
← lindenle left15:31
strk and yes, history is rewritten15:31
→ Neozonz joined15:32
alebeta :o ok, for do that is a different way15:32
→ InfoTest joined15:32
strk alebeta: if you're concern is the size of the repository, rewriting your history is the only way to reduce it (beside garbage collection)15:32
alebeta because if i delete one commit for example, this can make some errors15:32
→ chuchunaku joined15:33
alebeta with filter branch?15:33
bremner alebeta: I doubt that deleting a commit will save much space in any case. It's more likely you have large binary files in your history.15:33
alebeta yep15:33
and then i don't want older thant 6 month15:33
→ otter768 joined15:34
strk so you want to "trim" history ?15:34
alebeta i create this line to take all the commits, from the file older than 6 months15:34
git log -g --before='6.months.ago' --pretty=oneline -- $k | grep commit | awk '{print $1}'15:34
but know talking with you look like commits delete is not the way15:35
→ SpeakerToMeat joined15:35
alebeta hahaa15:35
yes strk something like that15:35
← a3Dman left15:36
alebeta because all this version take some space ^^ that i need for my small test environment15:36
versions*15:36
strk alebeta: you can "squash" commits togheter15:37
(turn multiple commits into a single one)15:37
← Neozonz left15:37
strk like, everything committed more than 6 months ago becomes a single commit15:37
→ a3Dman joined15:37
← a3Dman left15:37
→ a3Dman joined15:37
strk anything added and removed within that timefram would just never be included15:38
→ stangeland joined15:38
alebeta ok, and this make me save space?15:38
bremner !binary15:38
gitinfo Storing binary files in git causes repo balloon, because they do not compress/diff well. In other words, each time you change a file the repo will grow by the size of the file. See !annex for some solutions15:38
→ yqt joined15:39
bremner what is the filter-branch trigger?15:39
alebeta are not binary are config files ^^15:39
← otter768 left15:39
bremner then I doubt squashing history will help much.15:39
← jstimm left15:39
bremner alebeta: how many commits and how many files are we talking about?15:39
← cbonobo left15:39
strk alebeta: did you try git gc --aggressive ?15:40
also, are you aware of git clone --depth=<number_of_commits_to_fetch>15:40
I guess depth-limited cloning would give you an idea of how much space could be saved by squashing15:40
← lb left15:41
→ lindenle joined15:41
→ thinkxl joined15:42
← xcesariox left15:43
→ sparetire_ joined15:45
← yqt left15:46
← Samual left15:46
→ Lachezar joined15:46
→ yqt joined15:47
← yqt left15:47
→ cdown_ joined15:47
→ Neozonz joined15:47
← Neozonz left15:47
→ Neozonz joined15:47
Lachezar Hey all. Is it possible to fast-forward a branch that is not currently checked-out? I'm working on master, I have uncommitted changes, but another branch 'feature' has moved forward.15:48
→ nvahalik joined15:48
strk doesn't git fetch do that ?15:48
→ yqt joined15:48
← jml32ljl2 left15:48
Lachezar strk: no I've fetched, but my local feature is 44 commits behind the origin/feature15:49
strk: Unless I need something other than 'git fetch --all'15:49
strk never understood if origin/feature is also accessible offline...15:49
→ dreiss joined15:50
→ DaddyEric joined15:50
→ notebox joined15:50
Lachezar strk: git branch --all --verbose15:50
← monthy left15:51
alebeta strk, are like 8 config files and has like 18 commits older than 6 months per files more are less15:51
→ Rodya_ joined15:51
→ editshare-ericf joined15:51
alebeta i still don't try nothing for delete or change something because i want to be sure hehehehe i don't want make a big mistake ^^15:52
strk alebeta: how big are those config files ?15:52
actually, how big is your repo ?15:52
cd yourclone; du -s .15:52
← Neozonz left15:52
kadoban Lachezar: None of the obvious ways to ff a branch can really be done when you're not /on/ the branch, AFAIK. The thing to do would probably just be to stash your changes, change branches, and then merge --ff-only or whatever you want.15:53
← LeBlaaanc left15:53
kadoban Lachezar: Or maybe: why do you want to fast-forward the branch? Perhaps you don't have to to achieve your goal (unless that /is/ the entirity of the goal).15:53
← mischat left15:54
alebeta strk, 242415:54
this is the output but not specify the measure15:54
→ mellernoia-work joined15:54
← Technocrat7 left15:54
alebeta i don't know if this is MB or KB15:54
→ skorgon joined15:55
→ jstimm joined15:55
strk KB15:56
add -m for MB15:56
← mellernoia left15:56
Lachezar kadoban: That's a pretty good question. I'll have to contemplate on that.15:56
alebeta 3 MB LOL15:56
→ Technocrat7 joined15:56
strk do you still need to shrink it ? :)15:57
← chuchunaku left15:57
alebeta yes, because i have like 10 branch more T_T15:57
← Rodya_ left15:57
strk alebeta: run git gc and re-check15:57
→ chuchunaku joined15:58
strk that count is for the whole repository, which include all branches and all history15:58
← vigintas left15:58
alebeta and i know that with the time i will need this in the future15:58
→ devoldmx joined15:58
alebeta and then is good if i do that know c:15:58
Ö15:58
← byteflame left15:58
alebeta for example in other the size is 11315:59
strk du -ms .git15:59
← latrommi left15:59
strk (so you remove the checked-out branch from the count)15:59
alebeta i have a repository for each brand of device that i save in git15:59
→ byteflame joined16:00
← sdothum left16:00
← dreiss left16:00
→ nafg_ joined16:00
alebeta i store for example Cisco, Extreme, Fortinet, network device16:00
and each one has a repository16:00
← lindenle left16:00
alebeta and each repository with the branch master16:00
← psopacua left16:01
strk make a clone of a repo, to test16:01
→ vigintas joined16:01
→ Ahmed90 joined16:01
alebeta then we can see, that i have different sizes for different repository16:01
→ sdothum joined16:01
strk so you're safe if you break anything16:01
pick the biggest of your repos16:01
→ vrishab joined16:01
strk clone it in a temp table16:01
alebeta how i can clone in a temp table?? T_T16:02
strk sorry, remove "table" :)16:02
→ User458764 joined16:02
strk temp dir16:02
alebeta aaaa16:02
ok ok16:02
hahahaha16:02
→ workerbeetwo joined16:02
← s00pcan left16:03
← devoldmx left16:03
→ s00pcan joined16:03
← vrishab left16:03
alebeta ok perfect i did 'git clone /directory/repo'16:03
is ok?16:03
→ Neozonz joined16:03
→ vrishab joined16:04
strk check it :)16:04
workerbeetwo hey. I got HEAD == branch on top of master, now I'd like to merge master up there, as a fast forward. can I do this manually to make sure there no other merge commit created ?16:04
→ Rodya_ joined16:04
alebeta yes has the same size16:04
and the files16:05
← forbidden404 left16:05
→ thedodd joined16:05
strk what's the difference between size of .git and total size (including checkout-out tree)16:05
→ Farkie_ joined16:05
strk in other words, how much is the git database and how much the files you need16:06
→ happy-dude joined16:06
→ mr-label joined16:07
→ lindenle joined16:07
→ bango2 joined16:07
→ ekleog joined16:07
strk alebeta make another clone, with no checkout: git clone --bare /directory/repo /tmp/bare_repo16:07
→ adgtl_ joined16:08
alebeta from .git is 112MB16:08
Farkie_ Hey, Can I get some help? I have quite a busy repo - we have "release/uat" which has been quite busy since being re-created from master on 30th september. Now because the client doesn't want a feature that has been merged in to release/uat (a few times due to tweaks), we need to revert anything to do with this feature. Any ideas how I can do this easily? Ideally I'd like to re-merge them later, but if need be I'll re-reverse the commit.16:08
← Lachezar left16:08
→ thinkxl_ joined16:08
← Neozonz left16:09
← ekleog left16:09
alebeta yes is the same size16:09
→ ekleog joined16:10
← thinkxl left16:10
← timvisher left16:10
→ timvisher joined16:10
→ adac joined16:11
→ tanuck joined16:11
→ devinclark joined16:11
adac How do you guys handle sensitive data within, in my case, Docker or docker compose files? I currently save my docker configs into a git repository, but I feel very uncomfortably saving them in cleartext in the git repo..16:11
← madewokherd left16:11
← adgtl left16:11
strk alebeta: and how big is *just* the checkout ?16:11
canton7 don't commit them to the repo, no16:11
→ acti0nman joined16:12
strk alebeta: like, move the .git dir elsewhere16:12
canton7 a simple solution is to make them available in the environment16:12
← star_prone left16:12
→ legendary joined16:12
→ rpdprd1 joined16:13
→ mmlb joined16:13
→ negaduck_ joined16:13
alebeta i don't have .git here16:13
in the clone16:13
→ latrommi joined16:13
← User458764 left16:13
strk alebeta: not the bare clone, the other one16:13
alebeta or do you mean in the real repository16:13
→ tfnico_ joined16:14
→ wizonesolutions_ joined16:14
strk there's no "real", they are all clones16:14
alebeta ok the non productive16:14
strk just make sure to keep one as the "official" one and avoid messing with it :)16:14
→ kwmiebach_ joined16:14
← adamTPM left16:14
→ eijk joined16:14
→ dharriga1 joined16:14
→ Lunatrius` joined16:14
strk so yes, move .git out of the non-productive clone, and check its size16:14
← subscope left16:14
→ jaafar joined16:14
alebeta in the first clone, no the bare clone, is not .git directory16:15
→ sLite_ joined16:15
→ subscope joined16:15
alebeta a no wait16:15
wait16:15
sorry16:15
xD16:15
→ Ademan_ joined16:15
strk 112MB is your .git database (full history) -- your current tree is how big ?16:15
← macrover left16:15
alebeta without the .git is only 1 mb16:15
→ imMute^ joined16:15
adac canton7, but the environment I have to save somewhere too, right?16:15
→ jan_ joined16:15
→ tbsaunde_ joined16:15
→ heroux_ joined16:16
→ axisys_ joined16:16
→ raenk_ joined16:16
→ dlitz_ joined16:16
strk alright, so you have > 100x history than current, makes sense to trim :)16:16
← ril left16:16
strk if you don't need history...16:16
→ GingerGeek_ joined16:16
← GingerGeek_ left16:16
→ GingerGeek_ joined16:16
→ jakob- joined16:16
← subscope left16:16
→ EugeneKay joined16:16
strk now try yet another clone, only keeping last 10 commits:16:16
→ madduck_1 joined16:16
→ zm4c1n3 joined16:16
→ Farkie joined16:16
→ cmoneylulz joined16:16
strk git clone --depth=10 /productive/repo /tmp/trimmed16:16
→ weox joined16:16
→ ScottE_ joined16:16
→ subscope joined16:17
← mbrzuzy left16:17
← rpdprd left16:17
← Eugene left16:17
← tanuck__ left16:17
← GingerGeek left16:17
← tomog999 left16:17
← dwmw2_gone left16:17
← heroux left16:17
← negaduck left16:17
← endiruna left16:17
← axisys left16:17
← sLite left16:17
← jstimm left16:17
← notebox left16:17
← acti0nma_ left16:17
← eijk_ left16:17
← maxorator left16:17
← jaafar_ left16:17
← zmachine left16:17
← Farkie_ left16:17
← dharrigan left16:17
← cosql left16:17
← asdofindia left16:17
← madduck left16:17
Lunatrius` → Lunatrius16:17
→ maqr_ joined16:17
EugeneKay → Eugene16:17
heroux_ → heroux16:17
rpdprd1 → rpdprd16:17
madduck_1 → madduck16:17
→ tomog999_ joined16:17
→ mrkake joined16:17
→ LBV_User joined16:17
→ spriz_ joined16:17
→ endiruna joined16:17
→ fold2 joined16:17
→ dwmw2_gone joined16:17
→ ska-fan joined16:17
→ g105b joined16:17
→ dreiss joined16:17
→ j416_ joined16:17
→ ArmOrAttAk joined16:17
→ pluc_pilou joined16:17
→ axtx joined16:17
alebeta strk, done16:18
← jay-m left16:18
strk how big is that alebeta ?16:18
alebeta o.o 1316:18
11316:18
*16:18
→ ulkesh joined16:18
strk try --depth=116:18
→ asdofindia joined16:19
→ Shentino joined16:19
→ maxorator joined16:19
tfnico_ → tfnico16:19
j416_ → j41616:19
→ astockton joined16:19
→ adamTPM joined16:19
← byteflame left16:19
gitinfo set mode: +v16:19
→ Neozonz joined16:20
→ Oebele joined16:20
gitinfo set mode: +v16:20
→ byteflame joined16:21
alebeta o.o ok this is strange16:21
is the same16:21
→ MarkyC_ joined16:21
← NeverDie left16:21
kwmiebach_ → kwmiebach16:21
← go1111111 left16:22
→ Rubin_ joined16:22
→ ril joined16:22
strk then I misunderstood what --depth was about :)16:22
or you're checking the wrong directory16:22
alebeta no no hahaha16:22
im in the right one16:22
→ mischat joined16:23
strk du16:23
← MarkyC left16:23
wizonesolutions_ → wizonesolutions16:23
→ go1111111 joined16:24
← Neozonz left16:24
alebeta strk, T_T16:25
← garples left16:25
→ Samual joined16:26
→ adgtl joined16:26
→ aretecode joined16:26
← ntio left16:26
← adgtl_ left16:26
alebeta is not so easy like delete normal files hehehehe16:26
← exarch left16:26
← endiruna left16:27
← dreiss left16:27
← adac left16:27
kasper93 I have removed branch where big files were commited. Though after repack I still see this object in git verify-pack -v, but not in git rev-list --objects --all. How do I find where it is hiding? And remove from package?16:27
← subscope left16:27
→ shiriru joined16:28
← Balliad left16:28
→ subscope joined16:29
strk alebeta: I've to leave, if you find out why --depth is not doing what is supposed to, let me know16:29
alebeta: check with git log if you really still have all history rather than the requested --depth16:29
I do, with git version 1.9.1 (tested locally)16:29
bbl16:29
→ Balliad joined16:30
← subscope left16:30
← lindenle left16:31
alebeta strk, ok! thanks for your time and have good day!16:32
→ MechtiIde joined16:32
→ Karkus joined16:33
← adgtl left16:33
→ subscope joined16:33
→ Psychiatrist joined16:33
→ adgtl joined16:33
→ lubarch joined16:34
→ slentzen joined16:34
→ ntio joined16:35
kasper93 Oh, nevermind. It was still being referenced by reflog. Now it is gone.16:35
← axisys_ left16:35
→ Neozonz joined16:36
← ycon_ left16:36
← skyroveRR left16:37
→ ajacmac joined16:37
→ durham joined16:37
→ LeBlaaanc joined16:38
thinkxl_ → thinkxl16:39
→ AugustoCesar joined16:39
→ lindenle joined16:39
→ adac joined16:40
→ thiago joined16:41
→ jteneyck joined16:41
← Neozonz left16:41
← tlaxkit left16:42
← chuchunaku left16:42
→ chuchunaku joined16:43
← Guest96383 left16:43
→ daito joined16:43
→ alanwill joined16:43
→ cosql joined16:44
← aranea left16:44
← Balliad left16:46
← daito left16:48
→ endiruna joined16:48
← ajacmac left16:48
→ FireArrow133 joined16:49
→ mrballcb joined16:49
→ fyn joined16:49
→ kilo_bravo joined16:50
fyn Hi. What's a recommended Git hosting solution?16:50
Speficially, for a small 3-5 developer team.16:50
← lubarch left16:51
→ EduardoMartins joined16:51
kadoban fyn: self-hosted gitolite, bitbucket, or github, probably in that order16:51
I doubt there's a real consensus though, it depends a lot on what you need.16:51
→ Neozonz joined16:52
← Neozonz left16:52
→ Neozonz joined16:52
fyn kadoban: how about Gitlab, I enjoyed using it for my own personal projects.16:52
← lykinsbd left16:52
fyn kadoban: we need stability and availability. to a lesser extent, we care about their issue tracking.16:52
strk fyn: I'm struggling with setting up public access to my self-hosted solution right now16:52
kadoban I haven't used it. I don't really like web-UIs and gitolite seems easier to manage.16:53
fyn strk: yeah, we don't really want to self-host.16:53
strk but ssh-mediated access is great16:53
→ latrommi_ joined16:53
← latrommi left16:54
← vigintas left16:54
→ madewokherd joined16:54
→ sssilver joined16:54
→ vigintas joined16:55
← ilmgb left16:55
→ ilmgb joined16:56
← Neozonz left16:56
→ neataroni joined16:57
→ mikeybisbo joined16:57
→ mwhooker joined16:57
← devinclark left16:59
← MarkyC_ left17:00
→ devinclark joined17:00
← ilmgb left17:00
← dantix left17:00
← tanuck left17:01
→ MarkyC joined17:01
→ gopar joined17:01
→ Ldip joined17:02
← cosql left17:02
← lindenle left17:03
← vikas027 left17:03
← chuchunaku left17:03
← thedodd left17:04
→ kpease_ joined17:04
→ thedodd joined17:04
← kpease left17:04
← kpease_ left17:05
→ tgunr joined17:05
matthiaskrgr_ → matthiaskrgr17:05
← Imaginativeone left17:06
← br0kenman left17:06
→ Gsham joined17:07
→ kpease joined17:07
← shiriru left17:07
→ Neozonz joined17:07
← tvw left17:08
→ cosql joined17:09
← bollullera left17:09
← yqt left17:10
← ki0_ left17:10
← timvisher left17:11
← cmoneylulz left17:11
→ timvisher joined17:11
→ lindenle joined17:11
← TomyWork left17:12
← led_belly left17:13
← Neozonz left17:13
← alebeta left17:13
← subscope left17:13
→ jstimm joined17:14
← bongjovi left17:14
→ imachuchu joined17:15
← synthroid left17:15
← Ahmed90 left17:16
rnsanchez_ → rnsanchez17:18
→ tvw joined17:18
← EduardoMartins left17:18
← devinclark left17:19
← gopar left17:19
→ sagittarian joined17:20
← [lewellyn] left17:20
→ Radivarig joined17:20
← byteflame left17:21
→ diego1 joined17:22
← diego1 left17:22
→ diego1 joined17:22
→ gopar joined17:23
→ crose joined17:23
← dviola left17:23
← workerbeetwo left17:23
diego1 → dviola17:23
→ Neozonz joined17:23
← Neozonz left17:23
→ Neozonz joined17:23
→ Imaginativeone joined17:24
→ Spacew00t joined17:25
→ TobyP_ joined17:25
← joseph_8_ left17:25
→ bongjovi joined17:26
→ pozitrono joined17:27
← Neozonz left17:28
→ led_belly joined17:29
← skorgon left17:30
← lewellyn left17:31
← Qudit314159 left17:31
→ subscope joined17:32
→ venmx joined17:33
→ lubarch joined17:34
← subscope left17:35
→ NeverDie joined17:35
→ otter768 joined17:35
→ ShapeShifter499 joined17:35
← lubarch left17:36
← kpease left17:36
→ grawity joined17:36
← mithenks left17:36
→ ilmgb joined17:36
→ cbonobo joined17:36
→ lewellyn joined17:37
→ BBBThunda joined17:37
← mikecmpbll left17:37
← liamonade left17:37
→ NeverDie_ joined17:38
→ devinclark joined17:39
← devinclark left17:39
← kurkale6ka left17:39
→ devinclark joined17:39
← roentgen left17:39
← freimatz left17:39
→ Neozonz joined17:40
← Neozonz left17:40
→ Neozonz joined17:40
← NeverDie left17:40
← luriv left17:40
← otter768 left17:40
→ ascarter joined17:40
← lindenle left17:41
→ synthroid joined17:41
→ mingwandroid joined17:41
← {AS} left17:41
← mrballcb left17:41
← ilmgb left17:41
← adgtl left17:41
→ adgtl joined17:42
← Rodya_ left17:42
→ vigilancer joined17:43
← Imaginativeone left17:44
← hwoarang left17:45
← Neozonz left17:45
→ hwoarang joined17:45
← hwoarang left17:45
→ hwoarang joined17:45
→ dr_lepper joined17:46
→ Krotikx joined17:46
← adac left17:46
→ akiva joined17:46
→ lindenle joined17:47
← MarkyC left17:47
← Xethron left17:47
→ EduardoMartins joined17:48
← jaafar left17:50
→ ghoti joined17:50
← jstimm left17:50
→ kaiza joined17:51
→ avqsu joined17:51
→ melbatoast joined17:51
← avqsu left17:51
→ cdg joined17:52
→ ecmike joined17:52
→ nfk joined17:52
← durham left17:52
← cdg left17:53
← encod3 left17:53
← achadwick left17:53
→ cdg joined17:53
→ weeza joined17:54
← AugustoCesar left17:54
→ armyriad joined17:54
→ UmbraMalison joined17:55
← dviola left17:55
→ Neozonz joined17:55
← cromero left17:56
← tgunr left17:56
→ ilmgb joined17:56
← zeroed left17:56
→ joel_falcou joined17:56
→ weeza_ joined17:57
← Ldip left17:57
← weeza left17:58
→ scarabx joined17:58
← Gsham left17:59
→ duckmaestro joined18:00
← jost left18:00
← scarabx left18:00
fyn Does Gitlab have a good reputation as a hosted provider?18:00
E.g. reliability, availability, performance, etc?18:01
← The_Phoenix left18:01
→ mikecmpbll joined18:01
NeverDie_ → NeveriDie18:01
NeveriDie → NeverDie18:02
qsuscs shall i start ranting again?18:02
i don't like any of those18:02
→ TomyLobo joined18:03
qsuscs (well i suppose i'd like gitolite, but i don't promise anything until i've tried it)18:03
← sssilver left18:03
← Technocrat7 left18:03
_ikke_ gitolite is mainly authorization18:03
→ sssilver joined18:03
milki and makes no promises about your hosting capability18:04
:P18:04
← vigilancer left18:05
→ d4rklit3 joined18:05
← axtx left18:05
← nowhere_man left18:05
→ axtx_ joined18:05
→ cdg_ joined18:06
axtx_ → axtx18:06
← led_belly left18:07
→ Technocrat7 joined18:07
← Noldorin left18:07
← sssilver left18:08
← Psychiatrist left18:08
qsuscs yes.18:09
ChanServ set mode: +vvvv18:09
ChanServ set mode: +v18:09
← cdg left18:09
_ikke_ I CAN SPEAK AGAIN :P18:09
→ Gsham joined18:09
qsuscs gz18:09
← sdothum left18:09
→ Imaginativeone joined18:10
→ axtx_ joined18:10
→ sdothum joined18:10
→ led_belly joined18:10
← cdg_ left18:10
fyn qsuscs: you're welcome to start ranting18:10
→ Noldorin joined18:10
→ weeza joined18:10
qsuscs naaa18:10
← MechtiIde left18:10
qsuscs not now18:10
← bongjovi left18:11
← axtx left18:11
fyn I like the idea of a hosted solution because I don't want to manage my own git instance with Gitolite or whatever18:11
axtx_ → axtx18:11
→ nowhere_man joined18:11
kadoban fyn: Then I've enjoyed using bitbucket. github is fine too, but its limited by not having a free tier that allows any kind of private collaboration for a team.18:12
→ ki0 joined18:12
fyn kadoban: what about gitlab? afaict, its free tier is at least as good as BB18:12
and yeah, I don't like Github for the same reason - lack of free tier.18:12
← weeza_ left18:13
← nowhere_man left18:13
qsuscs github has a free tier for me18:13
_ikke_ bitbucket limits on collaborators, gitlab doens't18:13
qsuscs but screw github.18:13
kadoban I haven't used it. If you already know and use it, might as well stick with that?18:13
qsuscs though, i might use it for university stuff18:13
because setting up gitolite on $server would be quite a hassle18:13
_ikke_ meh18:14
installing gitolite is peace of cookie18:14
fyn kadoban: yeah, BB used to be my favorite, but now gitlab is18:14
qsuscs _ikke_: not on that server.18:14
_ikke_ ah, solaris?18:14
fyn so I'm thinking to just use it18:14
qsuscs _ikke_: no, only one user, not root.18:14
→ jceb joined18:14
→ pwojtasik joined18:14
fyn kadoban: how's the issue tracking on BB?18:14
_ikke_ gitolite does not require root18:14
unless you miss some dependencies I guess18:14
← Gsham left18:15
_ikke_ But it does want to own your authorized_keys file18:15
← pwojtasik left18:15
kadoban fyn: Seemed pretty serviceable. It doesn't get in my way and has some basic features so I was good with it.18:15
→ pwojtasik joined18:16
fyn kadoban: one thing I dislike about both Github and Gitlab is the barebones ticketing system that has 1) milstones, 2) labels, 3) that's it.18:16
← axl_ left18:16
fyn vaguely recall BB's ticketing might be more capable, lemme look at it again for a second18:16
← phaleth left18:17
← stamina left18:18
→ Oculus joined18:18
→ awt joined18:18
ril → ril[away]18:18
← Oculus left18:18
→ Oculus joined18:18
← lindenle left18:18
← awt left18:19
→ pantsman- joined18:19
→ led_belly_ joined18:20
→ phaleth joined18:20
← slentzen left18:22
→ jaafar joined18:22
→ Cqb joined18:22
← Cqb left18:22
← Oculus left18:23
→ Oculus joined18:23
← Oculus left18:23
→ Oculus joined18:23
← led_belly left18:23
← strk left18:23
← mischat left18:24
ril[away] → ril18:24
→ vigilancer joined18:24
→ User458764 joined18:24
→ jagob joined18:24
← tvw left18:25
→ leTali joined18:25
← led_belly_ left18:25
→ lindenle joined18:26
→ dantix joined18:26
← anth0ny_ left18:26
→ tvw joined18:27
→ luriv joined18:28
← synthroid left18:28
← thiago left18:28
→ nowhere_man joined18:29
→ {AS} joined18:29
→ m0viefreak joined18:30
→ arup_r joined18:31
← dantix left18:33
← vigilancer left18:34
→ vigilancer joined18:34
→ dreiss joined18:34
→ adac joined18:35
← troulouliou_div2 left18:36
→ slentzen joined18:36
← phaleth left18:37
← Spacew00t left18:37
← marcogmonteiro left18:37
← latrommi_ left18:39
→ tesla joined18:40
→ synthroid joined18:40
→ Spacew00t joined18:40
← negaduck_ left18:40
← ilmgb left18:41
→ durham joined18:42
→ HelloShitty joined18:42
HelloShitty → HelloAtMega18:42
← mikeybisbo left18:43
→ daito joined18:44
← durham left18:45
→ axl_ joined18:45
→ mikeybisbo joined18:46
→ durham joined18:46
→ Sasazuka joined18:47
→ Miesco joined18:48
← adamTPM left18:48
→ cagedwisdom joined18:49
← daito left18:49
← Neozonz left18:49
← astockton left18:49
← lindenle left18:50
→ weaksauce joined18:51
→ DanZ3 joined18:51
→ crank1988 joined18:52
← sorenb left18:52
← mikeybisbo left18:54
→ latrommi joined18:54
jasom I host my own phabricator install and am very happy with it18:54
→ Lauven joined18:55
← dreiss left18:55
← Error404NotFound left18:55
→ liamonade joined18:56
→ soerenb joined18:57
← vigintas left18:57
← vigilancer left18:58
→ makenoise joined18:58
← EduardoMartins left18:59
→ cspotcode joined18:59
← joki left18:59
jasom issue tracker has type, status, priority, assignees, CCs, access-control on visibility and editability, can be assigned to project(s), can attacch revisions, subtasks, mark duplicates and even add mocks for feature requests18:59
← filisko_ left19:00
jasom I haven't tried it but phoreplay.com hosts up to 5 users for free19:00
ojacobson "phoreplay"? really?19:00
jasom just noticed the double-entendre... I'm a bit slow19:01
jasom was pronouncing it "pho replay" in my head19:01
→ Neozonz joined19:01
→ MacWinne_ joined19:02
→ lindenle joined19:03
← phantombeta left19:03
→ skirk joined19:03
→ phantombeta joined19:04
→ joki joined19:04
← devinclark left19:04
ChanServ set mode: +o19:04
Eugene changed the topic to: We use git, but don't be a git. Help given and wanted, or just crack dirty jokes | Current stable version: 2.6.3 | Start here: http://jk.gs/git | Getting "cannot send to channel"? /msg gitinfo .voice | git-prune: not as tasty as git-cherry, but much better for you19:05
Eugene kicked Eugene (Back to work!)19:05
→ led_belly joined19:05
→ kpease joined19:05
→ Eugene joined19:05
← StuartMI left19:06
← harish left19:06
→ ytrezq joined19:07
← GT4066 left19:07
← ascarter left19:07
→ Error404NotFound joined19:08
→ thiago joined19:08
→ axelunicorn joined19:08
→ ascarter joined19:08
← pwojtasik left19:08
← rnsanchez left19:09
→ mikeybisbo joined19:09
← Error404NotFound left19:09
ytrezq Hello, how do I get a list of all objects sha1 for bash scripting from a git repository ?19:09
→ rubyonrailed joined19:09
← luriv left19:09
← cagedwisdom left19:10
_ikke_ git rev-list --objects19:10
← slentzen left19:10
← Technocrat7 left19:10
← vrishab left19:11
→ StuartMI joined19:12
← axelunicorn left19:12
ytrezq _ikke_: which show nothing19:13
→ mbrzuzy joined19:13
_ikke_ add --all for good measure19:14
→ luriv joined19:14
← skirk left19:14
ytrezq and how just get the sha1 withous paths ?19:15
_ikke_: and how just get sha1 without paths ?19:15
← makenoise left19:15
← tinajohnson left19:16
← cyphase_ left19:16
→ apfeluser joined19:17
_ikke_ Not sure19:17
← apfeluser left19:17
← ascarter left19:17
ytrezq also this doesn“t list dangling blibs19:17
also this doesn“t list dangling blobs19:17
← bango2 left19:18
← zacts left19:18
→ bigpic joined19:18
ytrezq and this require that all loose objects are valid, which isn’t really my case19:19
(the packfile is valid)19:19
_ikke_ You'd need git fsck for that, but it does not report all hashes19:20
← ThomasLocke left19:20
bigpic I’m sure hosting binaries in a git repo has been talked about ad nauseam. to minimize boat is it possible to say for example truncat the history so that git will only retain N versions of the file?19:20
Imaginativeone my repository is in a different location from my working files...19:20
how do I access it?19:20
ytrezq _ikke_: git fsck is stack dumping19:20
← jceb left19:21
ytrezq that’s why I need a script to recover19:21
← Hounddog left19:21
→ Hetu joined19:22
kadoban O.o git fsck is breaking? Ow.19:22
_ikke_ ytrezq: git fsck dumping stack sounds like a serious issue19:22
→ cagedwisdom joined19:23
→ hanthings_ joined19:23
→ lesshaste joined19:24
lesshaste hi19:24
I am trying to follow these install instructions for some software called pyston https://github.com/dropbox/pyston/blob/master/docs/INSTALLING.md . What are the git config --global user.email "you@example.com"19:24
git config --global user.name "Your Name"19:24
19:24
lines for?19:24
→ devinclark joined19:24
lesshaste why would it need to know my email address to compile some code?19:24
_ikke_ I would not know19:24
lesshaste I mean what does git config --global do?19:25
→ JosephSilber joined19:25
_ikke_ lesshaste: it updates the config file in your homedir19:25
Eugene git wants to know your user/email for creating commits. It will emit an error if you haven't set those variables19:25
kadoban lesshaste: It sends the global (to your user) git config. So it sets what your name and email are. It'll go in ~/ But … you shouldn't have to do that to build some project.19:25
_ikke_ Eugene: I would not expect a build script making commits19:25
lesshaste ah.. ok thanks19:25
Eugene You shouldn't need to make a commit do do a clone & checkout, but their README has you do it for some reason19:25
→ jceb joined19:25
lesshaste I will try not to use them19:25
← JosephSilber left19:25
Eugene Ask the project why they're a bunch of raving idiots maybe ;-)19:26
lesshaste I am never going to commit anything to this projeect19:26
ytrezq _ikke_: or do you know how to build a blob that match this sha1 ? (in fact the database is valid but it seems a pointer to the sha1 point to a filename in a tree object)19:26
404040404040404040404040404040404040404019:26
Eugene Then don't worry about it19:26
kadoban lesshaste: It won't really hurt anything either though, if you ever plan to use git you might as well do it at some point.19:26
→ JosephSilber joined19:26
_ikke_ ytrezq: That looks suspicious19:26
ytrezq 4040404040404040404040404040404040404040 = "@@@@@@@@@@@@@@@@@@@@@@@" (which is inside my filename)19:26
lesshaste kadoban, thanks19:27
→ axelunicorn joined19:27
ytrezq _ikke_: the tree is valid but git is wrong when determining the address of the sha in the file19:27
lesshaste is now a bad time to complain about how slow git clone is :)19:27
?19:27
_ikke_ lesshaste: yes19:28
:P19:28
→ phaleth joined19:28
kadoban lesshaste: It's mostly as fast as your internet is, IME.19:28
lesshaste _ikke_, :) Why is git clone not as fast as downloading that number of MBs?19:28
kadoban, oh ok.. it seems a lot slower to me. As if it is downloading many parts rather than serialising the whole thing19:28
ytrezq if I can build a blob with that sha1 "4040404040404040404040404040404040404040" then I would be able to fsck19:29
lesshaste like an earlier version of unison (if anyone uses that(19:29
)19:29
kadoban ytrezq: That's … a hard problem, by definition.19:29
_ikke_ ytrezq: That can only be done by bruteforcing19:29
← xaa left19:30
kadoban ytrezq: Unless you have a break for sha1 in your back pocket, you'll have to find some other solution to whatever it is that's going on.19:30
_ikke_ ytrezq: How did you end up in this state?19:30
→ makenoise joined19:30
→ stamina joined19:30
_ikke_ (such a break would be worth a lot of $$$)19:30
But why is it 40 repeating in the hash?19:31
← jteneyck left19:31
← liamonade left19:31
→ mischat joined19:31
ytrezq _ikke_: with the fact that git developer chose C, the generic assembler. I wouldn’t have that problem if git was written in python or java19:31
_ikke_: @=0x4019:32
← lindenle left19:32
→ vyorkin joined19:32
ytrezq and @@@@@@@@@@ is part of the filename I used19:32
← vyorkin left19:32
_ikke_ So you see that hash was overwritten by part of the filename?19:32
you say*19:33
lesshaste so what is the format?19:33
_ikke_ lesshaste: format of what?19:33
what git is sending?19:33
lesshaste git config --global [email@hidden.address] "me@apple.com" ?19:33
kadoban You have a file named "@@@@@@@@@" ? Oi.19:33
lesshaste I mean what is what should user.email me?19:33
be?19:33
is it a username?19:33
or an email address?19:33
_ikke_ email address19:33
lesshaste so it is really19:33
git config --global [email@hidden.address] "me@apple.com" ?19:34
kadoban lesshaste: git config --global user.email "me@apple.com"19:34
→ skullcrasher joined19:34
kadoban user.email is the config item you're setting.19:34
lesshaste or the user.email remains!19:34
thanks19:34
_ikke_ ytrezq: Did you do something special to get in this state?19:34
→ ascarter joined19:35
ytrezq _ikke_: no a tree object entry consist of filemode\0name\0sha1. but in my case the pointer computed by git point to filename instead of sha119:35
lesshaste argh.. total failure :(19:35
thanks for the help all nonetheless19:35
→ lindenle joined19:35
→ otter768 joined19:36
ytrezq _ikke_: no a tree object entry consist of filemode\0name\0binarysha1. but in my case the pointer computed by git point to filename instead of the beginning binarysha119:36
← lesshaste left19:36
ytrezq _ikke_: no a tree object entry consist of filemode\0filename\0binarysha1. but in my case the pointer computed by git point to somewhere in filename instead of the beginning binarysha119:36
_ikke_: no a tree object entry consist of filemode\0filename\0binarysha1. but in my case the pointer computed by git point to somewhere in filename instead of the beginning of binarysha119:36
kadoban ytrezq: Somehow I'm doubting your analysis of what happened. In what circumstances did it do that?19:36
ytrezq (5Gb large filename)19:37
_ikke_ o_019:37
ytrezq path use 32 bits signed ints19:37
_ikke_ which is 4Gb19:37
kadoban You have a filename that's 5GB long?19:37
ytrezq _ikke_: no 2GB19:38
kadoban: yes19:38
_ikke_ Oh, signed, right19:38
kadoban In a real repo? Why do you even care about recovering from this? I could see doing that for testing, but … in a real repo?19:38
_ikke_ ytrezq: Is it your intention to break git / pushing it's limits?19:38
→ astockton joined19:38
ytrezq _ikke_: yes it is19:38
kadoban: I need a valid repo for pushing19:38
kadoban ytrezq: Why do you even care about the repo? You … were doing tests designed to break git in a repo you care about? O.o why?19:39
_ikke_ ytrezq: Did you manually create the tree object?19:39
← doener left19:39
ytrezq _ikke_: yes I did19:40
→ jstimm joined19:40
→ ncthom91 joined19:40
ytrezq kadoban: for things like this https://bounty.github.com19:40
_ikke_ aha19:40
← otter768 left19:40
ytrezq I spent hundreds hours at reading the code. I think It’s reasonable to get a reward for that amount of work19:41
kadoban ytrezq: Sure, good great, but … you're trying to recover the repo? Why would you even care? Can't you recreate the bug?19:41
_ikke_ ytrezq: And I gather you already tried with a smaller filename in order not to break git?19:41
← jceb left19:41
_ikke_ kadoban: He is not talking about a real repo19:41
← latrommi left19:41
_ikke_ kadoban: He's crafting a repo which he can push to github19:42
→ vigintas joined19:43
ytrezq _ikke_: I need a valid repo that the server could handle (I warned them, they fixed their servers, but they need a valid heap overflow in order to award the associated maximum for server side remote code execution)19:43
and I need the repo to look valid19:43
→ liamonade joined19:43
← astockton left19:43
← imack left19:44
→ cvanball joined19:44
→ latrommi joined19:44
_ikke_ ytrezq: Not sure if it's that simple, but couldn't you patch your local git to prevent it choking on the path size?19:44
→ chucky_z joined19:44
ytrezq _ikke_: they fixed their servers in order to avoid risk. I need vuln git client and server19:45
→ Psychiatrist joined19:45
_ikke_ ytrezq: If you know the location in the filename that git interprets as the hash, you can make sure the filename contains a valid hash in that part19:46
kadoban ytrezq: So, instead of being in a situation where you need a file with the hash 0404040…, can you change it so you have a file, know its hash and then insert /that/ hash where it needs to go?19:46
_ikke_ kadoban: gmta19:46
← InfoTest left19:46
kadoban Hehe19:46
ytrezq kadoban: the pointer place would change if the machine is wether big or little endian19:47
→ Gsham joined19:47
_ikke_ You can inject it wherever you like, not?19:47
kadoban ytrezq: But in that case there's only two possibilities, right? 50% chance of causing the bug isn't enough? (you can probably guess if it's little or big anyway though)19:48
← Hetu left19:48
→ MarkyC joined19:48
ytrezq and @@@@@ is the printable string that is the most compressible with zlib19:48
_ikke_ ytrezq: But just to be sure, aren't you publicly disclosing the bug right now?19:48
ytrezq it also depend of os/machine19:49
no19:49
_ikke_ ok19:49
→ Hetu joined19:49
ytrezq they took fixes19:49
→ ilmgb joined19:49
ytrezq you’ll be disconnected if an object is larger than 2Gb19:49
_ikke_ ytrezq: Well, it's practicly impossible to get an object in the hash 40{16}19:50
← kpease left19:50
→ dreiss joined19:50
_ikke_ ytrezq: makes sense19:50
→ cmoneylulz joined19:50
← ril left19:50
_ikke_ But you want to still prove it would break things would they accept such an object?19:50
← Miesco left19:51
← cmoneylulz left19:51
→ cmoneylulz joined19:51
ytrezq _ikke_: they fixed in order to be sure, but they need a buffer overflow case in order to award the bounty19:52
_ikke_ ytrezq: But how do you intend to cause that when they reject objects >2gb?19:52
ytrezq (In fact it’s their git fork I use not the official client)19:52
_ikke_: they told it to me19:52
and it’s because of me they reject those sizes without error messages19:53
_ikke_ I mean, how do you plan to cause the buffer overflow, when they would block the object you are trying to send19:53
ytrezq: I get that19:53
→ waveclaw joined19:54
← tesla left19:54
← thinkxl left19:54
← MarkyC left19:54
→ kpease joined19:54
→ romankl joined19:55
→ InfoTest joined19:55
← acti0nman left19:55
ytrezq It‘s just the matter of saying19:55
hey you fixed that, but it really allowed remote code execution19:55
kadoban ytrezq: So is the above suggestion infesible, or just tedious? I don't see why you can't just be more careful in the file name and get a hash that matches. Maybe at the most you'd have to do /some/ brute-forcing of sha1 to get one that matches your requirements?19:55
But at least you won't have to get an exact pre-image, just a hash with certain (hopefully not-too-strict) properties.19:56
← romankl left19:56
ytrezq kadoban: brute forcing would require more money than I could won19:56
kadoban ytrezq: But what properties would the hash actually need to have? Just printable-ascii or something?19:56
→ romankl joined19:56
→ dngor joined19:58
ytrezq a filename need to be printable utf 819:58
kadoban: there’s no blob matching 404040404040404040404040404040404040404019:58
kadoban ytrezq: That's not a very high bar to meet though, I'd think /most/ sha1 hashes as bytes meet that criteria.19:58
→ abacuspowers joined19:59
ytrezq https://hashkiller.co.uk/sha1-decrypter.aspx is no help19:59
→ vrishab joined19:59
grawity there *can be* a blob matching that19:59
← cvanball left19:59
ytrezq grawity: how to build it19:59
grawity it's just that there's a nearly-infinite amount of blobs so it's impossible to bruteforce them19:59
ytrezq ?19:59
kadoban ytrezq: Well there is, but yes it's computationally infesible to find it.19:59
grawity unless you find a preimage attack in SHA119:59
→ devoldmx joined20:00
← ascarter left20:00
→ thinkxl joined20:00
grawity that's kind of an important point in the "strength" of a hash algorithm20:00
Seveas if that's found, git is in trouble :)20:00
→ astockton joined20:00
qsuscs git 3.0: sha-51220:00
kadoban ytrezq: If all you need is valid-utf8 though … that's basically cake.20:00
Seveas qsuscs: maybe sooner, the object-id patch series seem to be progressing20:01
axtx On the 11th hour, Of the 11th day, Of the 11th month, We will remember them.20:01
qsuscs Seveas: i don’t follow that closely20:01
→ ascarter joined20:01
kadoban Seveas: If I remember correctly from previous discussions on it … actually not much trouble at all really though.20:01
_ikke_ Not all hashes are valid utf820:01
kadoban _ikke_: Yes, but finding one that is should be easy, no?20:02
← lindenle left20:02
← circa left20:02
ytrezq _ikke_: hash are stored in binary20:02
← ascarter left20:02
_ikke_ ytrezq: I know20:02
→ sbogg joined20:02
_ikke_ binascii.unhexlify("12bb5522f03cdfe78265320e3149c0f2ac205fb4").decode('utf8')20:02
This one is not valid20:03
Seveas kadoban: it's a lot of code churn that can easily conflict with a lot of other topics in flight20:03
← sinkensabe left20:03
Seveas the change itself is relatively simple, the coordination is a pain20:03
← eka left20:04
kadoban Ah I'm not familiar with the change you're talking about. I was just responding to the "git is in trouble" part.20:04
→ ril joined20:04
← devoldmx left20:04
Seveas ah ok20:04
→ sinkensabe joined20:05
ytrezq qsuscs: I’m sure if changing to sha 512 worth it. remember it won’t be possible to get more process power per chip after 2012 with current technology (requiring replacements like quantum transistors)20:05
and sha 512 is vulnerable to that20:05
qsuscs: I’m sure if changing to sha 512 worth it. remember it won’t be possible to get more process power per chip after 2019 with current technology (requiring replacements like quantum transistors)20:06
* 201920:06
grawity vulnerable to what exactly20:06
holodoc If I create a new branch (git branch -b new_branch) then stage some untracked files (git add -A) should't checking out other branches remove staged files from the working copy?20:06
grawity holodoc: no20:06
holodoc: the staging area is still not part of any branch20:06
kadoban holodoc: Basically that's !float20:07
gitinfo holodoc: If you have made a change in your working directory and have NOT YET COMMITTED, you may "float" that change over to another (`git checkout oldbranch`) or new (`git checkout -b newbranch`) branch and commit it there. If the files you changed differ between branches, the checkout will fail. In that case, `git stash` then checkout, and `git stash apply` and go through normal conflict resolution.20:07
← bigpic left20:07
ytrezq grawity: a full real quantum computer would be able to bruteforce sha 51220:07
← paulweb515 left20:07
grawity [citation needed]20:07
holodoc So only committed files are subject to actually influencing working copy not those that are just in the index?20:07
ytrezq (by getting the required parallel processing power)20:07
grawity so far all resources I've found assume that quantum processing can only weaken hashes & symmetric crypto, not entirely break it20:08
holodoc That clear up some things. Thanks.20:08
← sinkensabe left20:09
grawity ytrezq: e.g. http://security.stackexchange.com/a/48027/4258 or https://en.wikipedia.org/wiki/Lamport_signature#Security_parameters claim otherwise20:09
kadoban grawity: Grover's Algorithm is theoretically a really big break in basically all hashes. "weaken" is called a break, in cryptography.20:09
→ tanuck joined20:09
→ lindenle joined20:10
grawity kadoban: that's rather different from being able to "bruteforce sha 512"20:10
kadoban grawity: Yes, probably.20:10
grawity not really comparable to Shor's, which from what I understand completely destroys RSA and the like20:10
Eugene Easier-than-impossible is still "close to impossible"20:10
→ Goplat joined20:11
_ikke_ all commits in git.git are invalid utf8 strings20:11
← jstimm left20:12
kadoban _ikke_: Are they really? Interesting. To the whiteboard …20:12
_ikke_ Even all objects are invalid20:13
ytrezq hey but if even sha1 would end to be completely broke tomorow. How this would impact git ? since it’s just used for checksuming20:13
hey but if even sha1 would be completely broke tomorow. How this would impact git ? since it’s just used for checksuming20:13
hey but even if sha1 would be completely broken tomorow. How this would impact git ? since it’s just used for checksuming20:14
kadoban _ikke_: Everything with every byte under 128 would be valid, right? So it'd be … 0.5**20, at worst, right? Or is there a stronger criteria I'm missing?20:14
ytrezq kadoban: and above 2020:14
kadoban ytrezq: It would impact signed commits and such.20:14
← axtx left20:14
← liamonade left20:14
ytrezq kadoban: yes but what it would allow to do ? (for an attacker)20:14
grawity ytrezq: it's not "just checksumming" – that would mean Git just needs it for error detection20:15
Seveas easier-than-impossible is my middle name20:15
← adgtl left20:15
→ blr joined20:15
grawity ytrezq: the hashes are also used as an identity of each object20:15
kadoban ytrezq: It would make the signatures useless. You could forge a commit and say "this guy signed it".20:15
grawity ytrezq: so if you could make a new commit with the same hash as another, you could trick people into downloading files that weren't supposed to be there20:15
← latrommi left20:16
← d4rklit3 left20:16
ytrezq kadoban: I can already do it with github users, and github staff thought low risk20:16
→ cvanball joined20:16
→ versatiletech joined20:16
kadoban ytrezq: So that'd be about 3e-8 odds of a hash being valid, which isn't too bad at all. You can do a hundred million hashes in reasonable time.20:16
(assuming my math is correct, which isn't given)20:16
→ d4rklit3 joined20:17
← mbrzuzy left20:18
ytrezq (since github identify it’s users by e-mail address one can create a commit and push it so the associated username and user photo would appear in the user interface)20:18
(private e-mail)20:18
kadoban ytrezq: Hmm? I think we're talking about something different. I'm talking about PGP signed commits/tags/whatever.20:19
ytrezq kadoban: and github don’t use pgp20:19
or more exectly ingore it20:19
kadoban ytrezq: Well that's rather besides the point. You asked what the impart would be of a sha1 break. It would impact signed commits. If github doesn't use them, then that doesn't affect them.20:20
← gopar left20:20
ytrezq ok20:20
→ strayPuppy joined20:21
→ gopar joined20:21
ytrezq I mean I can’t see what "hey someone did that" would allow20:22
(where the someone didn’t in reality)20:22
← mr-label left20:22
kadoban _ikke_: So yeah I guess it's not very surprising that none of the git.git objects match. Though you should be able to create one manually if you try. About 1 in a million hashes are all bytes less than 128. If you get more picky it gets closer to infesible though.20:23
→ Mr-label joined20:23
← gopar left20:23
→ gopar joined20:24
_ikke_ right20:24
ytrezq it‘s different from being able to actually push it somewhere20:24
← ncthom91 left20:24
ytrezq it‘s different from being able to actually push it somewhere you should not be allowed to do it20:24
kadoban ytrezq: Yes, but it /significantly/ reduces the usefulness of signed tags.20:24
→ viljaste joined20:25
→ axtx joined20:25
→ NeckBeardPrince joined20:25
ytrezq kadoban: In fact, I can’t even see how pgp signing is useful in git (in terms of security)20:25
→ zivester joined20:25
→ dopesong joined20:26
← luriv left20:26
kadoban ytrezq: It's usually not. It's useful in the case where you want some guarantee that the person you expect is asserting that they wrote (or at least approved) the code you're looking at though.20:27
Eugene git doesn't care about gpg, at all.20:27
← cvanball left20:27
kadoban But then you get into "how do I know this is your key?" etc. which is an annoying issue.20:27
ytrezq kadoban: only usefull in case of filling a lawsuit later20:28
kadoban: which is only usefull in case of filling a lawsuit later20:28
→ MattMaker joined20:28
ytrezq (since courts usally expect strong proof)20:28
kadoban ytrezq: Well, not really.20:28
ytrezq I can‘t see how it‘s usefull to “guarantee that the person you expect is asserting that they wrote” in terms of security20:30
→ Layzie joined20:30
ytrezq unless you need to fire someone in a company and you need to prove what he has done bad20:31
→ mbrzuzy joined20:32
← sagittarian left20:33
← Lauven left20:33
kadoban ytrezq: You don't see why you'd want to know who's code you're running?20:33
ytrezq kadoban: no I don’t see the interest about lieing about it20:34
kadoban: no I see no interest in lieing about it20:34
← cdown_ left20:34
← ilmgb left20:35
ytrezq except for doing a kid level joke20:35
→ cdown joined20:35
_ikke_ kadoban: I have several hashes now that according to python can be decoded from utf820:36
← hanthings_ left20:36
_ikke_ Note that the contents aren't really legible20:36
← abacuspowers left20:37
qsuscs Seveas: are you a real op by now?20:37
_ikke_ d'oh, I need to make sure they're valid objects20:37
→ neanderslob joined20:38
kadoban Right, actually legible is going to be pretty hard. Probably like … numbers, letters, a few symbols and maybe spaces?20:38
→ tinanoo1 joined20:40
_ikke_ |\x1b\x0b\x1d*hC6o1;U]5a \x17sc20:40
'(n5\x08\x1foxʖoJIT]v:\x16!m20:40
But those contain chars <2020:40
ytrezq _ikke_: path are null terminated. ascii control characters are a way to write inside the .git directory20:42
(on some fs)20:42
→ looper joined20:42
ytrezq so they are rejected20:42
_ikke_ right20:42
← arup_r left20:42
ytrezq and what I need is a blob (meaning arbitrary content)20:42
→ tinanoo joined20:43
← versatiletech left20:43
_ikke_ but blobs have a tiny header20:43
ytrezq a blob can be binary20:43
_ikke_ yes20:43
but it starts with blob or BLOB20:43
and the size20:43
and a zero byte20:43
→ Ahmed90 joined20:44
← tinanoo1 left20:44
← Hetu left20:44
ytrezq what is hard is to put a binary sha1 in a filename moreover if the place is partially at random20:45
→ Balliad joined20:45
→ daito joined20:45
← Ahmed90 left20:45
← makenoise left20:45
→ lindenle_ joined20:45
← lindenle left20:45
→ sinkensabe joined20:46
→ CheckDavid joined20:46
→ eka joined20:47
kadoban ytrezq: How random is it? Is it just taking an arbitrary part of the filename? Then you have really good odds if you just repeate the hash in the filename over and over.20:47
← tinanoo left20:47
kadoban ytrezq: 20 attempts isn't that hard, right?20:47
← lindenle_ left20:48
ytrezq kadoban: remember filename should be assembly20:48
→ liamonade joined20:48
kadoban ytrezq: Oh it needs to be valid machine-code as well? I don't think you've mentioned that.20:49
→ lindenle joined20:49
ytrezq no but if contains sha1 it can‘t contain machine code20:49
→ yqt joined20:49
ytrezq no but if it contains sha1 it can‘t contain machine code20:49
← sinkensabe left20:49
→ tinanoo joined20:49
← daito left20:50
ytrezq also filename should be well zlib compressible20:50
data20:50
_ikke_ kadoban: Cannot seem to get anything anymore20:50
→ ASOLAr joined20:51
kadoban _ikke_: What are you attempting exactly, just to create a valid object file with a utf-8 hash now?20:51
_ikke_ oh, stupid20:51
kadoban: yes20:51
kadoban ytrezq: I'm not really clear on what the requirements are then :-/20:51
ytrezq stuck http://stackoverflow.com/q/33565280/228457020:52
kadoban Hmm, let me play. I'll have to look up what the format is though.20:52
_ikke_ kadoban: "blob <size>\0"20:52
← lindenle left20:52
← joel_falcou left20:52
← King_Hual left20:52
ytrezq there’s no null byte in blobs20:53
← kaiza left20:53
_ikke_ ytrezq: there is...20:53
ytrezq only in trees or commit20:53
→ espindola joined20:53
_ikke_ the on-disk format, after decompressing starts with that header20:53
osse ytrezq: [citation needed]20:54
ytrezq you can check it with zpipe -d on any valid blob loose object20:54
← Gsham left20:54
→ lindenle joined20:54
_ikke_ https://stackoverflow.com/questions/1869885/calculating-sha1-of-a-file20:54
ytrezq I just used the sha1sum command line tool20:55
← Balliad left20:55
ytrezq (and didn’t bothered with that)20:55
osse then you get the wrong answer20:55
kadoban _ikke_: Is the filesize including the header and everything I assume?20:55
ytrezq kadoban: everything after size20:56
← tvw left20:56
_ikke_ kadoban: https://stackoverflow.com/a/552725/2026120:56
→ latrommi joined20:56
→ ilmgb joined20:56
kadoban Nice, thanks. Okay, let's see …20:56
← tinanoo left20:56
← lindenle left20:57
→ interru joined20:57
_ikke_ is there a way to validate arbitrary git objects? (not in a repo)20:57
osse $ perl -MCompress::Zlib -e 'undef $/; print uncompress(<>)' < .git/objects/d3/50f6519c03539344382131ff5afe63e01bec2c | xxd | head -120:57
00000000: 626c 6f62 2037 3632 3431 0023 2054 6865 blob 76241.# The20:57
BAM!20:58
ytrezq _ikke_: yes with python gitlib20:58
(that’s I used)20:58
→ lindenle joined20:59
osse $ { printf 'blob %s\0' $(wc -c < Makefile); cat Makefile } | sha1sum21:00
d350f6519c03539344382131ff5afe63e01bec2c21:00
_ikke_ Hmm, pip does not want to install gitlib21:00
→ paulweb515 joined21:00
osse try libgit21:00
← nafg_ left21:00
ytrezq _ikke_: you need to install every file manually21:01
→ sinkensabe joined21:01
ytrezq (which is what I did)21:01
→ nafg_ joined21:01
ytrezq the point is gitlib is simpler than gitdb21:01
→ marc_v92 joined21:01
→ tpollard joined21:01
→ tinanoo joined21:01
← marc_v92 left21:02
← roygbiv left21:02
_ikke_ pygit2?21:02
← latrommi left21:03
← lindenle left21:03
ytrezq _ikke_: it‘s just a binding to libgit2 C library21:04
It’s also less powerfull21:04
_ikke_ right, mostly highlevel functions21:04
→ lindenle joined21:05
→ filisko_ joined21:05
← devinclark left21:06
→ uri joined21:06
← paulweb515 left21:07
→ devinclark joined21:07
_ikke_ is gitlib only python 2?21:07
→ nfk|laptop joined21:07
→ Dejan__ joined21:08
→ jstimm joined21:08
_ikke_ yup21:10
← ASOLAr left21:10
→ oojacoboo joined21:11
← PeterBooker left21:11
← Layzie left21:11
→ bizix joined21:12
← jstimm left21:12
← astockton left21:13
→ paulweb515 joined21:13
→ latrommi joined21:13
→ Nick_1 joined21:13
← DaddyEric left21:14
← Nick_1 left21:14
→ Es0teric joined21:15
→ sssilver joined21:18
← strayPuppy left21:18
← crose left21:18
← madewokherd left21:18
← filisko_ left21:18
ytrezq _ikke_: send an example to your private tab21:20
(/queru)21:21
(/query)21:21
← sdothum left21:21
→ circa joined21:22
→ negaduck joined21:23
→ adgtl joined21:23
→ sdothum joined21:23
→ Sleepy63 joined21:24
← mizu_no_oto left21:25
← phaleth left21:25
← lindenle left21:26
← Imaginativeone left21:27
→ MarkyC joined21:27
→ mizu_no_oto joined21:27
→ dantix joined21:27
← neanderslob left21:27
← romankl left21:28
→ sagittarian joined21:28
→ ASOLAr joined21:30
← juvenal left21:31
← NeckBeardPrince left21:31
→ josuebrunel joined21:31
→ neanderslob joined21:31
← uri left21:33
← italoacasas left21:33
berndj is there a way to git to tell me ALL the files is does/doesn't know about? if i've accidentally created a file .git/UNKNOWN_TO_GIT (or deeper in the .git hierarchy) i want a way to discover these21:33
← User458764 left21:33
_ikke_ not really21:34
← mizu_no_oto left21:34
← Noldorin left21:34
→ G________ joined21:34
← weox left21:35
← ASOLAr left21:35
_ikke_ git doesn't mind there being extra files.21:35
→ nnyk joined21:36
← nafg_ left21:36
← adac left21:36
→ otter768 joined21:37
← ki0 left21:37
_ikke_ objects with hashes without control characters <20 are much harder to find21:37
← Darcidride left21:37
→ lindenle joined21:38
kadoban _ikke_: About 30 times as hard I think.21:38
← Krotikx left21:38
_ikke_ well, I do have characters > 127 (I check if it is valid unicode, so that wouldn't matter)21:38
→ kriskropd_ joined21:39
kadoban Ah21:39
kriskropd_ → kriskropd__21:39
kriskropd__ → kriskropd21:40
berndj i'm writing an ad hoc git-aware backup program. i guess i can accept random files under a .git not being backed up21:40
→ boombatower joined21:41
← synthroid left21:42
← otter768 left21:42
← endiruna left21:43
ytrezq _ikke_: it’s kindly the kind of full time work21:43
→ Aut0maton joined21:44
← Aut0maton left21:44
← PCatinean left21:45
← pozitrono left21:45
_ikke_ haven't found any without control characters yet21:45
← UmbraMalison left21:45
← G________ left21:45
_ikke_ 53K hashes/s, not that much21:45
Eugene Out of curiousity, what're we brute-forcing?21:46
berndj - man gitrepository-layout is the closest I can give you21:47
gitinfo berndj: the gitrepository-layout manpage is available at http://jk.gs/gitrepository-layout.html21:47
← Nikhil_D left21:47
dmod_ is there a config option for me to have each commit signed off?21:47
_ikke_ Eugene: filenames that are valid hashes and valid blobs21:47
Eugene -svn and -submodule will create their own dirs in there21:47
→ Miesco joined21:47
→ Nikhil_D joined21:48
→ averageuser joined21:48
← josuebrunel left21:49
← ril left21:50
← viljaste left21:50
→ adac joined21:51
← timvisher left21:51
→ cmn joined21:51
→ timvisher joined21:51
→ weox joined21:53
→ ril joined21:53
← nfk|laptop left21:54
← axtx left21:54
← MarkyC left21:56
→ astockton joined21:56
← mbrzuzy left21:56
→ yohnnyjoe joined21:56
← ssarah left21:57
→ subscope joined21:57
← modocache left21:59
→ strayPuppy joined21:59
→ nafg joined22:00
→ devoldmx joined22:00
→ UmbraMalison joined22:00
← astockton left22:01
_ikke_ No luck yet finding a hash..22:01
Or I'm doing something worng22:01
← thedodd left22:02
→ thedodd joined22:02
← subscope left22:02
→ bango2 joined22:03
→ endiruna joined22:03
← circa left22:04
← Radivarig left22:04
→ astockton joined22:04
→ it_tard joined22:05
← devoldmx left22:05
→ Radivarig joined22:05
ytrezq like when peoples discover even the most basic task is expending to full time work22:05
→ nidr0x joined22:06
→ juvenal joined22:06
→ ma489 joined22:06
_ikke_ classic off-by-one error :-/22:07
→ italoacasas joined22:07
← weaksauce left22:08
← nfk left22:08
ytrezq you spend more than one hour and practically achieved nothing. that’s give you an idea why security researcher want to get money even when working on free open source project22:08
→ diogenese joined22:10
← adac left22:11
ytrezq _ikke_: did you tried https://hashkiller.co.uk/sha1-decrypter.aspx22:11
_ikke_: did you try https://hashkiller.co.uk/sha1-decrypter.aspx22:11
→ zeroed joined22:12
_ikke_ no22:12
Those are more for things like passwords22:12
ytrezq ok22:12
→ weaksauce joined22:12
kadoban ytrezq: That's only going to work for looking for a particular SHA1. Also won't help it match a particular format.22:12
← Goplat left22:13
← weaksauce left22:13
→ dsdeiz joined22:13
→ bongjovi joined22:13
→ weaksauce joined22:13
→ adamaN joined22:13
← eijk left22:14
_ikke_ I have a hash22:14
← sinkensabe left22:14
_ikke_ 7072daa2752243684e2f49712a3f7f4e725b7c5722:14
← bizix left22:15
_ikke_ ytrezq: interested?22:15
← bongjovi left22:15
← it_tard left22:15
← zivester left22:15
adamaN hi i am trying to deploy but have an error: ** [proxy-3 :: err] fatal: Not a git repository (or any of the parent directories): .git22:15
why is that?22:15
_ikke_ adamaN: Are you in the correct directory?22:16
adamaN yes22:16
iam using capistrano22:16
and it is working on 2 other proxies22:17
but not 3rd one22:17
ytrezq _ikke_: no sorry22:17
← dopesong left22:17
← Besogon left22:17
→ s8321414 joined22:17
← erichf left22:17
← latrommi left22:17
ytrezq _ikke_: or sorry yes, I am22:17
thanks22:18
just hope the blob isn’t too long22:18
just hope the blob isn’t too big22:18
→ G________ joined22:19
_ikke_ 128 bytes22:19
ytrezq good22:19
→ toothrot joined22:19
_ikke_ let me verify if it's correct though22:19
← IrishPrime left22:19
← stamina left22:20
→ mbrzuzy joined22:20
← nnyk left22:21
← cosql left22:21
← crank1988 left22:22
→ ndancer joined22:22
→ UTAN_dev joined22:23
← Es0teric left22:23
→ cyphase_ joined22:23
→ kaiza joined22:24
← mbrzuzy left22:25
_ikke_ git doesn't like the file :-(22:25
ytrezq too bad22:26
→ nnyk joined22:26
ytrezq _ikke_: remember zlib!=gzip22:26
if that‘s the error22:27
_ikke_ Yes22:27
ytrezq (I used zpipe)22:27
_ikke_ http://sprunge.us/VggG22:28
→ zivester joined22:28
→ cosql joined22:29
ytrezq _ikke_: I would have used pyopencl22:29
_ikke_ this is just something quick'n'dirty22:30
← afuentes left22:30
← Dejan__ left22:30
ytrezq _ikke_: by using /dev/urandom you’re essentially repeating on the same data22:30
iv4nnunes what causes it? Git Push Fails - fatal: The remote end hung up unexpectedly22:31
kadoban ytrezq: ? not really22:31
iv4nnunes My repository is on the local network.22:31
_ikke_ ytrezq: urandom is random enough, it uses a csprng22:31
ytrezq ok sorry22:32
kadoban It doesn't even have to be random actually, it could just be a nonce. But yeah that's not going to hurt anything.22:32
→ Besogon joined22:32
_ikke_ As long as it changes22:32
kadoban Right22:32
← AaronMT left22:33
← Mr-label left22:33
→ Mr-label joined22:34
← Mr-label left22:34
← CKyle left22:34
_ikke_ http://www.2uo.de/myths-about-urandom/22:35
← astockton left22:36
← juvenal left22:36
→ IWishIKnew joined22:37
→ astockton joined22:38
← Miesco left22:39
Eugene Every time somebody says "don't use urandom" I stop paying attention to anything else they have to say22:39
← ivan\ left22:40
Eugene I assume that the linux kernel devs are FAR more knowledgeable about this stuff than I am, and they say to use urandom. If that's not good enough for you, then obviously you should write your own kernel.22:40
← AAoK left22:40
→ juvenal joined22:41
← fkm left22:42
tbsaunde_ → tbsaunde22:42
Eugene This can be generallized to everything invlving crypto: rolling your own will get you pwnt before long22:42
← ma489 left22:43
→ ivan\ joined22:45
→ daito joined22:46
→ garples joined22:46
← editshare-ericf left22:46
← Karkus left22:46
ytrezq Eugene: the current case of use was about to get unlimited random data. It wasn‘t about security22:48
→ fkm joined22:48
← fkm left22:48
→ fkm joined22:48
← espindola left22:49
→ espindola joined22:49
→ Puhe joined22:50
← daito left22:50
← lewellyn left22:50
← TomyLobo left22:50
← bango2 left22:50
← Radivarig left22:50
← toothrot left22:51
→ lewellyn joined22:51
→ [gmi] joined22:51
→ robbyoconnor joined22:53
← pantsman- left22:54
→ filisko_ joined22:54
← [gmi] left22:55
← lewellyn left22:56
← endiruna left22:56
→ lewellyn joined22:58
→ xaa joined22:59
← t-mart_ left23:00
← nnyk left23:00
← sdothum left23:00
→ sdothum joined23:01
← zivester left23:02
→ gnawzie joined23:02
gnawzie hello23:02
gitinfo gnawzie: hi! I'd like to automatically welcome you to #git, a place full of helpful gits. Got a question? Just ask it — chances are someone will answer fairly soon. The topic has links with more information about git and this channel. NB. it can't hurt to do a backup (type !backup for help) before trying things out, especially if they involve dangerous keywords such as --hard, clean, --force/-f, rm and so on.23:02
→ safe joined23:02
→ harish joined23:02
← lewellyn left23:03
gnawzie Do most end users of git projects git clone into directories where they are to be used or do most people have a /home/user/git directory to clone into23:03
→ lewellyn joined23:03
→ waspinator_ joined23:03
← ndancer left23:04
→ ndancer joined23:04
→ circa joined23:05
kadoban gnawzie: Most end users of projects managed by git have no idea what git is, and never use git.23:05
gnawzie so I am not doing a good thing by using it...23:06
kadoban gnawzie: You probably don't have to, unless that's the only way someone gives you to get there project.23:06
their*23:06
→ SimonNa joined23:07
← lewellyn left23:09
→ madewokherd joined23:09
bremner which, sadly, is more and more true.23:10
← garples left23:10
← circa left23:11
← timvisher left23:11
→ timvisher joined23:11
jasom gnawzie: I have a directory for all of my miscellaneous git checkouts; it's analogous to ~/src where I have unpacked source tarballs from the Bad Old Days23:13
gnawzie haha23:14
→ anuvrat joined23:15
→ zivester joined23:15
jasom If you are both 1) building from source and 2) plan on someday upgrading to a newer version; then there is little reason not to just clone the repository23:15
← lindenle left23:15
jasom or in many cases 3) will stumble upon a bug that you want to fix23:15
→ Noldorin joined23:16
jasom too many projects have random crashes that can be fixed in under 10 minutes once you reproduce them under valgrind </rant>23:16
← cdown left23:18
← ril left23:18
Eugene I stuff junk into ~/code/23:18
← cosql left23:18
Eugene Periodically deleting anything I don't recognize23:18
→ cdown joined23:19
→ skirk joined23:19
→ toothrot joined23:19
→ hasB4K joined23:20
← hasB4K left23:20
→ hasB4K joined23:20
← Oebele left23:20
← sgambino left23:20
← fyn left23:20
← gnawzie left23:21
→ gnawzie joined23:21
← zeroed left23:21
← axl_ left23:21
← StuartMI left23:22
→ lindenle joined23:24
→ jave joined23:25
← chitopunk left23:25
← del left23:26
← Kicer86 left23:26
← weaksauce left23:26
→ Imaginativeone joined23:27
← mischat left23:28
← ytrezq left23:29
→ lewellyn joined23:29
← lewellyn left23:30
→ ytrezq joined23:33
← ytrezq left23:34
← IWishIKnew left23:36
→ lewellyn joined23:36
→ fyn joined23:37
→ otter768 joined23:37
← fyn left23:37
← rendar left23:38
← johtso left23:38
← lewellyn left23:41
→ CKyle joined23:41
→ lewellyn joined23:41
← CKyle left23:42
← astockton left23:42
← otter768 left23:42
→ jack_ joined23:43
→ IWishIKnew joined23:43
→ ncthom91 joined23:43
← sssilver left23:43
← Psychiatrist left23:43
→ unreal joined23:48
→ solvaring joined23:48
← kpease left23:49
← InfoTest left23:50
← robbyoconnor left23:52
→ robbyoconnor joined23:52
← nafg left23:54
→ CKyle joined23:56
← dancinggrass left23:57
← jagob left23:59

Logs Search ←Prev date Next date→ Channels Documentation