Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-02-25

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary

All times shown according to UTC.

Time Nick Message
00:00 rmbeer is possible use github.com with only something files of all the project?
00:01 m4sk1n joined #git
00:03 pie_ joined #git
00:04 rmbeer joined #git
00:14 Pulp joined #git
00:15 User458764 joined #git
00:16 xlegoman joined #git
00:16 kritzikratzi joined #git
00:17 MattMaker joined #git
00:17 lmatteis joined #git
00:22 venmx joined #git
00:26 dviola joined #git
00:34 netj joined #git
00:35 pfrench joined #git
00:36 ThatBob9001 joined #git
00:37 lucasem joined #git
00:39 inflames joined #git
00:40 syg_ joined #git
00:40 thethe joined #git
00:40 inflames joined #git
00:40 inflames joined #git
00:42 pur3eval joined #git
00:42 ahr3n joined #git
00:44 Levex joined #git
00:45 rmbeer fixed it... move something files and new directory, init new git and make a symbolic link from the main project....
00:46 ResidentBiscuit joined #git
00:47 madewokherd joined #git
00:47 peterbecich joined #git
00:47 gk_-1wm_- joined #git
00:49 gk_-1wm_- left #git
00:54 Ramne joined #git
00:56 PaulCapestany joined #git
00:59 chardan joined #git
00:59 pfrench joined #git
01:04 Levex joined #git
01:06 mischat joined #git
01:08 gugah joined #git
01:15 ljc joined #git
01:21 Eugene rmbeer - !subproject may be of interest
01:21 gitinfo rmbeer: [!subprojects] So, you want to add git repositories inside of other git repositories? Well, you have four main options. First is to just do it, add the repo to the outer project's .gitignore, and treat them entirely separately. Best if they are entirely separate. Otherwise your best options are "!submodule", "!gitslave", and "!subtree". Try those commands in this channel, or in a PM to avoid flooding.
01:24 venmx joined #git
01:24 matoro joined #git
01:24 a_thakur joined #git
01:26 bufferoverflow joined #git
01:26 acidjnk22 joined #git
01:27 kbs` joined #git
01:27 kbs` left #git
01:27 thiago joined #git
01:27 kbs joined #git
01:28 snowalpaca joined #git
01:30 livingstn joined #git
01:32 BW^- joined #git
01:32 BW^- can I recompile git to use BLAKE2b or SHA256 as hash instead, all over?
01:33 rmbeer Eugene, thank :)
01:33 [R] BW^-: sure, you have the source... you can make it do whatever you want
01:34 BW^- [R]: is there any ./configure option or other easy way?
01:34 BW^- [R]: maybe it's somehow very deep in the code..?
01:34 [R] no
01:34 BW^- [R]: cool.
01:34 jimi_ joined #git
01:34 BW^- [R]: ok so I just hunt down the SHA1 and replace it with Blake2b.
01:35 [R] lol
01:35 [R] sure
01:35 Orbitrix joined #git
01:43 pur3eval joined #git
01:45 pfrench joined #git
01:45 hahuang65 joined #git
01:46 shinnya joined #git
01:47 rmbeer left #git
01:49 Gustavo6046 joined #git
01:52 anuxivm left #git
01:52 bvcosta joined #git
01:52 raijin joined #git
01:53 nandi_ge___ joined #git
02:00 watabou joined #git
02:02 MattMaker joined #git
02:03 pfrench joined #git
02:04 matoro joined #git
02:04 durham joined #git
02:05 durham joined #git
02:08 pfrench joined #git
02:10 xaviergmail joined #git
02:10 gk_-1wm joined #git
02:11 pie_ left #git
02:12 hanthings_ joined #git
02:13 le_melomane joined #git
02:14 pfrench joined #git
02:14 xall joined #git
02:14 nothingnew joined #git
02:16 chachasmooth joined #git
02:16 tmsmith joined #git
02:19 JeremyD joined #git
02:20 pfrench joined #git
02:20 Atm0spher1c joined #git
02:22 cdg joined #git
02:23 ResidentBiscuit joined #git
02:25 venmx joined #git
02:25 DolpheenDream joined #git
02:26 Atm0spher1c joined #git
02:29 Eugene So, sha1
02:29 Eugene !sha1
02:29 gitinfo Git's usage of SHA1 hashes is largely immune to collisions because it includes a file-length header. Other protections and an eventual update to a new hashing algorithm are planned. http://marc.info/?l=git&m=148787047422954. Constructing an actual SHA1 collision is still very expensive, and accidental encounters are less likely than random wolf attacks. Fear their howl.
02:29 Lyqyd joined #git
02:29 chachasmooth joined #git
02:29 Eugene Git is immune from the particular style of collision Google employed because of the legnth-marker-prefix
02:32 Rodya_ joined #git
02:35 llamapixel The distributed element of the repos also makes it a no worry.
02:35 llamapixel How do you track all the repos and replace them?
02:35 llamapixel derp
02:37 rchavik joined #git
02:38 pfrench joined #git
02:40 gk-------1__w__m joined #git
02:40 MattMaker joined #git
02:46 bufferoverflow joined #git
02:46 chachasmooth joined #git
02:46 hhee joined #git
02:46 d^sh joined #git
02:46 pur3eval joined #git
02:46 Vampire0_ joined #git
02:46 ResidentBiscuit joined #git
02:48 ilbot3 joined #git
02:48 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | We are aware of the SHA-1 collision. See: http://jk.gs/t/a4 | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.11.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
02:50 Puffball joined #git
02:50 MattMaker joined #git
02:51 pfrench joined #git
02:52 canuk joined #git
02:54 pks joined #git
02:55 kbs interesting, is that statement about the prefix correct? aiui, the approach takes 2^63 to generate collisions given any specific prefix P - so in principle one could generate a suitable pair of blobs that start with "blob 20000\0".
02:56 MattMaker joined #git
02:56 SwiftMatt joined #git
02:56 pfrench joined #git
02:58 ozmage joined #git
02:58 Eugene Yes.
02:59 Eugene Google's SHA1 attack was dependent upon obtaining a common midstate in the hash algorithm
02:59 ozmage joined #git
02:59 Eugene This depends very strongly upon the input data stream
03:00 Eugene Git prefixes the input data(the file contents) with the content-length. Even if this matches between colliding objects, the fact that it is present changes the data stream and thus, the midstate
03:00 pfrench joined #git
03:01 kbs I do not think the attack begins by finding a colliding pair of objects and then prefixing the header (that fails, naturally)
03:01 Eugene So two colliding for which `sha1sum` matches will mathematically not match with `git hash-object`, or indeed with any other hash scheme
03:01 Eugene It is constructed by finding random permutatiosn of the input file(with padding bytes) that results in the same midstate
03:01 Eugene Then the rest of the object data is appended
03:01 b1tchcakes joined #git
03:02 kbs interesting - that's not the way I interpreted the paper
03:02 Peng Google/CWI could have chosen to generate collisions that began with the Git header. They just didn't. No?
03:02 kbs ^^ yes, that's my understanding as well
03:02 Eugene Correct. An attack against git would be of similar difficult, but limited to `git`
03:02 Eugene computational difficulty*
03:02 Eugene They chose to attack `sha1sum`, which is a derivative of the C function sha1()
03:03 * kbs & :-)
03:03 ojdo joined #git
03:03 Eugene git does not use the exact sha1 functon: it prepends the dataset's length
03:03 Eugene And thus, is a different hash fucntion
03:03 Peng Git uses the exact SHA-1 function over data with the length prepended, no
03:03 Peng ?
03:03 Peng "Google/CWI didn't think it would be funniest to attack Git in their demonstration" is not a security argument for Git.
03:05 Eugene It means "This isn't directly applicable to git".
03:05 Eugene Yes, it can be broken. It still costs several million dollars in electricity and effort
03:06 Eugene You also need to chain in an attack of rewriting the object into a useful collision, AND replacing the target object on public hosting providers AND get other people to re-clone the object
03:06 Peng That sounds a couple orders of magnitude higher than the last estimates
03:06 Eugene Noen of those are feasible
03:06 Eugene "effort" in terms of salary adds up quick
03:06 Peng True
03:06 Eugene If you need to verify something, use sha512 and GPG. Its fine.
03:07 Eugene gitsha1 is good enough for your code, I assure you.
03:07 Eugene And by the time it isnt, the sha3 patches will have landed
03:10 moparisthebest joined #git
03:11 bufferoverflow joined #git
03:12 hexagoxel joined #git
03:12 khaon joined #git
03:14 fstd joined #git
03:14 khaon hello everyone, my company does not delete hotfixes or features branches, so we got like +5000 branches. Is it bad ?
03:15 Eugene There's nothing "wrong" with having a lot of branches. But 5000 does seem excessive.
03:15 khaon is there duplicate among git object if doing so ?
03:16 Eugene No; git object collisions are so rare that it has never happened, and likely never will.
03:16 Tee_Pee joined #git
03:16 khaon imo the git repo is very slow dues to the amount of branches ( seems like git clone takes thousand of minutes)
03:16 nedbat khaon: are all 5000 of them something that has been released to a customer?
03:16 khaon everything is checkout from our develop branch
03:16 Eugene 5,000 branches does seem excessive, but I don't know exactly what that would slow down off the top of my hand.
03:16 sdc915 joined #git
03:16 khaon I would like to ask our CTO to delete those branches
03:17 khaon but is he like ..
03:17 nedbat khaon: why do you need the branches still? They've been merged to develop, right?
03:17 khaon indeed !
03:17 Eugene Ah, its a political thing
03:17 Eugene Sorry, "some advice from #git" is not good enough
03:17 Vortex34 joined #git
03:17 nedbat khaon: are these github pull requests?
03:17 khaon nope
03:18 Eugene If you want to convince your bot then chances are your boss is just dumb, and he needs to pay somebody to tell him not to do that
03:18 moparisthebest it's ok we don't use branches we just have like 40 complete forks of our repo on our server
03:18 XavierRaine joined #git
03:18 moparisthebest and we merge them as we need to...
03:18 khaon in fact i was hoping to understand if or why it was bad not to delete branches after a merge
03:18 nedbat moparisthebest: yikes. why?
03:18 khaon but indeed our cto seems not to know many things.
03:18 khaon in fact is kinda retarded
03:18 Eugene The "normal" usage is to delete branches after they aren't being used
03:18 nevodka abandon ship khaon
03:19 moparisthebest nedbat, never have any idea in what order features are going in so have to keep them seperate
03:19 bremner we just use a seperate server for each version of the software. Currently most of northern manitoba is full of warehouses of our history
03:19 Eugene Because, why would you keep old cruft?
03:19 nedbat khaon: i wish you wouldn't use that word that way
03:19 sdc915 left #git
03:19 nedbat moparisthebest: i don't understand. one git repo with branches would be fine for that, no?
03:20 khaon so does having thousand of branches, already merged, increased the amount of git objects?
03:20 duderonomy joined #git
03:20 Eugene No more than jsut having that many commits. I suspect that you're having problems because of the number of branches present(and the reflog for each)
03:20 moparisthebest oh right nedbat yea I think so, but we use mercurial and fork the repo any time a different feature is needed.... (this was decided about 2 weeks after I was hired so I didn't have any say :))
03:20 Eugene The number of commits really doesn't matter- see the linux.git repo
03:21 nedbat moparisthebest: hg has branches too, but ok, whatever :)
03:21 moparisthebest nedbat, yea I know, exactly :)
03:21 khaon in fact cloning our repo takes ages, while cloning smting like linux kernel doesnt. however we got like 180k objects ...
03:21 Eugene 180k ain't shit
03:22 khaon maybe he should gc the repo ? i think this cmd was never issued .
03:22 mablae_ joined #git
03:22 nedbat khaon: that could have more to do with your server's io speed
03:22 khaon i think linus told he would release v5 when they reach  5 million git objects.
03:23 khaon but w/e, my concern was is there any loose of perf when having like 5k branches instead of delete them when merged with develop branch
03:24 XavierRaine left #git
03:25 Xavier_Rayne joined #git
03:25 Xavier_Rayne left #git
03:26 venmx joined #git
03:26 Xavier_Rayne joined #git
03:27 Raed|Mobile joined #git
03:27 dsdeiz joined #git
03:28 bocaneri joined #git
03:28 chachasmooth joined #git
03:29 pfrench joined #git
03:30 raijin joined #git
03:31 Masber joined #git
03:32 Eugene I'm sure there is. Hwo much? I dunno. Benchmark it and tell us. THat's how science works
03:32 bocaneri joined #git
03:33 xaviergmail joined #git
03:33 hexagoxel joined #git
03:36 kbs joined #git
03:38 Khisanth joined #git
03:38 MattMaker joined #git
03:39 chachasmooth joined #git
03:41 pfrench joined #git
03:42 kent\n joined #git
03:42 ankit01ojha joined #git
03:49 pfrench joined #git
03:51 sunri5e joined #git
03:53 cdown joined #git
03:55 pfrench joined #git
03:55 nydel07 joined #git
03:57 chachasmooth joined #git
04:03 peterbecich joined #git
04:04 pfrench joined #git
04:06 kasual joined #git
04:06 BPL joined #git
04:07 BPL Hi, how can i use a particular gitignore file like this one? https://github.com/github/gitignore/blob/master/VisualStudio.gitignore , I guess I don't need to copy the whole content to the root's .gitignore, right?
04:08 Electrometro joined #git
04:09 b1tchcak_ joined #git
04:09 pfrench joined #git
04:11 Goplat joined #git
04:15 sunrunner20 is there a list of ways to present git repos as other than a bare directory?
04:15 menip joined #git
04:17 exitcode1 joined #git
04:20 pfrench joined #git
04:25 pfrench joined #git
04:27 Electrom_ joined #git
04:27 venmx joined #git
04:29 Electrometro joined #git
04:30 Electro__ joined #git
04:35 pfrench joined #git
04:39 MattMaker joined #git
04:39 pfrench joined #git
04:39 SwiftMatt joined #git
04:41 mizu_no_oto joined #git
04:42 ertes joined #git
04:42 nydel07 joined #git
04:43 mehola joined #git
04:45 safe joined #git
04:45 Sasazuka joined #git
04:47 KR1 joined #git
04:47 peterbecich joined #git
04:52 pfrench joined #git
04:52 Cabanoss- joined #git
04:53 KR1 left #git
04:54 MattMaker joined #git
04:54 MattMaker joined #git
04:56 a_thakur joined #git
04:57 Electrometro joined #git
04:59 kristofferR joined #git
05:00 pfrench joined #git
05:01 Emperor_Earth joined #git
05:05 ahr3n joined #git
05:06 pfrench joined #git
05:07 mischat joined #git
05:10 Ardethian\ joined #git
05:10 xaviergmail joined #git
05:10 armin_ joined #git
05:11 iron_houzi_ joined #git
05:11 tang^_ joined #git
05:11 synthmea1 joined #git
05:11 JJMcphearson joined #git
05:11 a_thakur joined #git
05:11 Electrom_ joined #git
05:12 BlaXpirit_ joined #git
05:12 suy_ joined #git
05:12 tinanoo1 joined #git
05:12 ionelmc_ joined #git
05:13 a_thakur joined #git
05:13 ppppp5_ joined #git
05:13 wagle_ joined #git
05:13 CabbageMan69 joined #git
05:13 ResidentBiscuit joined #git
05:13 pks_ joined #git
05:13 Puffball_ joined #git
05:14 angseus joined #git
05:14 GT4066 joined #git
05:14 helium-3 joined #git
05:14 jantje_ joined #git
05:14 boz_v1_ joined #git
05:14 trondth joined #git
05:14 sunny256_ joined #git
05:14 cmyers_ joined #git
05:14 FabTG_ joined #git
05:14 Kuukunen- joined #git
05:14 Daviey_ joined #git
05:14 Vauff_ joined #git
05:14 VladGh_ joined #git
05:14 gkatsev_ joined #git
05:14 cite_ joined #git
05:14 corentin_ joined #git
05:14 perlpilot_ joined #git
05:14 Rh0nda joined #git
05:14 babilen_ joined #git
05:14 Xenophon1 joined #git
05:14 ffledgli1g joined #git
05:14 Gaga joined #git
05:14 comps_ joined #git
05:14 remote_ joined #git
05:14 k5tux_ joined #git
05:15 slax0r_ joined #git
05:15 BadHorsi1 joined #git
05:15 ikonia_ joined #git
05:15 lu_zero_ joined #git
05:15 lu_zero_ joined #git
05:15 sysanthrope_ joined #git
05:15 stux|RC-only joined #git
05:15 fuchstro1aut joined #git
05:15 ploop_ joined #git
05:15 systmkor joined #git
05:16 Peng__ joined #git
05:16 Nugget_ joined #git
05:16 joinedsqueak joined #git
05:16 d^sh_ joined #git
05:16 artgoeshere_ joined #git
05:16 Patrick- joined #git
05:16 Spork_Witch joined #git
05:16 alphor_ joined #git
05:16 jordanlewis joined #git
05:16 jordanlewis joined #git
05:16 inflames joined #git
05:16 zero1985 joined #git
05:16 sim590_ joined #git
05:16 caffeinatedcode joined #git
05:16 caffeinatedcode joined #git
05:16 tolland_ joined #git
05:17 netj joined #git
05:17 Sleepy63 joined #git
05:17 BrianBlaze420 joined #git
05:17 azerus joined #git
05:17 HelloShitty joined #git
05:17 hfp joined #git
05:17 ygeLN joined #git
05:17 Korvin joined #git
05:17 Korvin joined #git
05:17 _cyril_ joined #git
05:17 Orbitrix joined #git
05:17 preaction joined #git
05:17 ToxicFrog joined #git
05:17 zyxep joined #git
05:17 hiroki joined #git
05:17 Dyonisos joined #git
05:17 hiroki joined #git
05:17 lucido joined #git
05:17 blackwind_123 joined #git
05:17 davidosomething joined #git
05:17 tterrag joined #git
05:17 Savage joined #git
05:17 APic joined #git
05:17 shinnya joined #git
05:17 RickyB98 joined #git
05:17 RickyB98 joined #git
05:17 ryxxed joined #git
05:17 Neico joined #git
05:17 devster31 joined #git
05:17 ntnn joined #git
05:17 mrkake joined #git
05:17 jesk joined #git
05:17 lukky513 joined #git
05:17 hfp_work joined #git
05:17 buck1 joined #git
05:17 Mixologic joined #git
05:17 sostenuto joined #git
05:17 SCHAAP137 joined #git
05:17 BrAsS_mOnKeY joined #git
05:17 chachasmooth joined #git
05:17 ertes joined #git
05:17 Xarodon joined #git
05:17 spacemud joined #git
05:17 marcan joined #git
05:18 ngladitz joined #git
05:18 ngladitz joined #git
05:18 TSS_ joined #git
05:18 causasui joined #git
05:18 glebihan joined #git
05:18 ignarps joined #git
05:18 psyb0t joined #git
05:18 jmesmon joined #git
05:18 d0nn1e joined #git
05:18 DonVitoCorleone joined #git
05:18 Vampire0_ joined #git
05:18 pythonholum joined #git
05:18 j416 joined #git
05:18 danemacmillan joined #git
05:18 guampa joined #git
05:18 Kobaz joined #git
05:18 storrgie joined #git
05:18 njbair joined #git
05:18 SirFunk joined #git
05:18 gnoirzox1 joined #git
05:18 vdl joined #git
05:18 anbz joined #git
05:18 thinkpad joined #git
05:18 toogley joined #git
05:18 ahammond joined #git
05:18 phy1729 joined #git
05:18 ljc joined #git
05:18 midnightmagic joined #git
05:19 jrahmy joined #git
05:19 g5pw joined #git
05:19 catern joined #git
05:19 matumbo` joined #git
05:19 dwts joined #git
05:19 justanotheruser joined #git
05:20 FilipNortic joined #git
05:20 Sergio965 joined #git
05:20 orzo joined #git
05:20 Electrometro joined #git
05:20 nevyn joined #git
05:20 Whiskey joined #git
05:21 s17 joined #git
05:21 Pursuit joined #git
05:21 Tatou joined #git
05:21 atomi joined #git
05:21 jleclanche joined #git
05:21 Salz joined #git
05:21 Salz joined #git
05:21 elijah joined #git
05:22 XDS2010 joined #git
05:22 dedicated joined #git
05:22 PaulePanter joined #git
05:22 pypypypypy joined #git
05:22 meLon joined #git
05:22 unholycrab joined #git
05:22 al-damiri joined #git
05:22 boxrick1 joined #git
05:22 ome joined #git
05:22 worstadmin joined #git
05:22 pizzaops joined #git
05:22 svm_invictvs joined #git
05:22 ggherdov joined #git
05:22 manveru joined #git
05:23 zeller joined #git
05:23 twisted` joined #git
05:23 redhedded1 joined #git
05:23 ToeSnacks joined #git
05:23 valkyr2e joined #git
05:23 jdelreal joined #git
05:23 Awesomecase joined #git
05:24 kireevco joined #git
05:24 Iacobus joined #git
05:24 raynold joined #git
05:24 EmeraldExplorer joined #git
05:24 prosody joined #git
05:24 mehdi___ joined #git
05:24 MLM_ joined #git
05:24 codedmart joined #git
05:24 zmachine_ joined #git
05:24 discopatrick joined #git
05:25 l2y joined #git
05:25 lolmac joined #git
05:25 pur3eval joined #git
05:25 CEnnis91 joined #git
05:25 byte512 joined #git
05:26 ulkesh joined #git
05:26 lebster joined #git
05:26 msm joined #git
05:26 cdown joined #git
05:26 stealthii joined #git
05:27 milkshoes joined #git
05:27 barq joined #git
05:27 gajus joined #git
05:27 ggherdov joined #git
05:28 venmx joined #git
05:28 cstrahan joined #git
05:28 ome joined #git
05:28 tharuin joined #git
05:29 pifon joined #git
05:30 Electrom_ joined #git
05:31 fahadash joined #git
05:33 hhee joined #git
05:35 Rodya_ joined #git
05:39 kireevco_ joined #git
05:39 pifon joined #git
05:40 PaulePan1er joined #git
05:41 Groscheri joined #git
05:41 dwts joined #git
05:41 jordanlewis joined #git
05:41 syg_ joined #git
05:41 ngladitz_ joined #git
05:41 alphor joined #git
05:41 njbair joined #git
05:41 pifon joined #git
05:41 kireevco joined #git
05:42 Sleepy63 joined #git
05:42 Xarodon joined #git
05:42 nikow joined #git
05:42 blackwind_123 joined #git
05:42 jesk1 joined #git
05:42 Mixologic joined #git
05:42 zyxep joined #git
05:42 thinkpad joined #git
05:43 chachasmooth joined #git
05:46 XDS2010 joined #git
05:47 atomi joined #git
05:47 Electrometro joined #git
05:47 XDS2010 joined #git
05:48 XDS2010 joined #git
05:52 pfrench joined #git
05:55 msisay joined #git
05:56 dsdeiz joined #git
05:56 dsdeiz joined #git
05:57 zmachine_ joined #git
05:57 acetakwas joined #git
05:58 zmachine joined #git
05:58 pfrench joined #git
05:59 dhollinger joined #git
06:01 finalbeta joined #git
06:01 MattMaker joined #git
06:05 aspiers joined #git
06:06 msisay left #git
06:08 pfrench joined #git
06:11 Electrom_ joined #git
06:13 gtristan joined #git
06:13 Electrometro joined #git
06:17 cdown_ joined #git
06:18 pfrench joined #git
06:18 b1tchcakes joined #git
06:25 f0rks joined #git
06:25 peterbecich joined #git
06:27 rchavik joined #git
06:28 pfrench joined #git
06:28 svm_invictvs joined #git
06:28 venmx joined #git
06:29 Wulf joined #git
06:29 ojacobson sunrunner20: such as…?
06:30 e joined #git
06:33 dreiss joined #git
06:35 pfrench joined #git
06:39 pfrench joined #git
06:40 Electrom_ joined #git
06:41 llamapixel I thought about gource but that would be too far out for what a normal person may want ;P
06:42 pur3eval joined #git
06:44 sunrunner20 ojacobson, github, but locally hosted
06:44 sunrunner20 free or cheap
06:45 pfrench joined #git
06:45 ojacobson gitolite's great if you only need repos
06:45 ojacobson if you need workflow tools (pull requests, etc) then gitlab, rhodecode, bitbucket server (not free, but cheap for small numbers of users), and a bunch of others are all options
06:50 pfrench joined #git
06:55 pfrench joined #git
07:00 Armand joined #git
07:00 venmx joined #git
07:00 pfrench joined #git
07:00 dermoth joined #git
07:03 senaps_ joined #git
07:04 kini joined #git
07:05 watabou joined #git
07:11 Rodya_ joined #git
07:15 jagob joined #git
07:17 Rodya_ joined #git
07:17 sbulage joined #git
07:18 tvw joined #git
07:18 swalladge joined #git
07:19 Savage left #git
07:20 pfrench joined #git
07:21 grift joined #git
07:22 PioneerAxon joined #git
07:29 shgysk8zer0_ joined #git
07:29 Wulf left #git
07:31 rmbeer joined #git
07:34 shgysk8zer0_ joined #git
07:36 rmbeer joined #git
07:38 PioneerAxon joined #git
07:38 rmbeer joined #git
07:40 rmbeer joined #git
07:41 xaviergmail joined #git
07:42 pfrench joined #git
07:43 Darren_ joined #git
07:45 ThatBob9001 joined #git
07:45 rmbeer joined #git
07:47 pfrench joined #git
07:55 moei joined #git
07:55 HurricaneHarry joined #git
07:57 govg joined #git
07:58 ThomasTang joined #git
07:59 pfrench joined #git
08:01 venmx joined #git
08:03 variable joined #git
08:05 ljc joined #git
08:06 watabou joined #git
08:06 pks joined #git
08:06 MattMaker joined #git
08:08 lamont joined #git
08:11 wongon joined #git
08:11 pfrench joined #git
08:12 moparisthebest left #git
08:14 spider_X joined #git
08:14 spider_X Hey guys, I am new to git and I am on Linux, currently I am trying to understand how I can get git to remember my username and log me in automatically when I have to push to master.
08:15 spider_X I tried doing git config --global user.name MyUserName
08:15 spider_X but I have the extra authentication stuff on my account and therefore I can only use the token as password
08:15 spider_X So, wondering if anyone can help me setup git to use SSH or something
08:16 phroa user.name is your real name, you should add "user@" to your remote's URL and set up an SSH key for authentication
08:16 phroa e.g. origin  git@github.com:phroa/x
08:16 ngladitz_ left #git
08:17 phroa see man git remote; you'll want 'git remote set-url <name> <new url>'
08:17 gitinfo the git-remote manpage is available at http://jk.gs/git-remote.html
08:17 cluelessperson joined #git
08:17 Rodya_ joined #git
08:17 venmx joined #git
08:18 ngladitz joined #git
08:19 spider_X Ok thanks phroa
08:20 User458764 joined #git
08:22 shgysk8zer0_ joined #git
08:24 jrm joined #git
08:27 MattMaker joined #git
08:30 MattMaker joined #git
08:32 finalbeta joined #git
08:32 Keverw joined #git
08:34 peterbecich joined #git
08:34 pfrench joined #git
08:36 troulouliou_div2 joined #git
08:37 thebird joined #git
08:38 wxg joined #git
08:38 thebird joined #git
08:39 SwiftMatt joined #git
08:40 robotroll joined #git
08:42 PioneerAxon joined #git
08:42 humboldt joined #git
08:42 pfrench joined #git
08:47 pfrench joined #git
08:50 xaviergmail joined #git
08:51 S_Winner joined #git
08:51 mahakal joined #git
08:51 pur3eval joined #git
08:53 SwiftMatt joined #git
08:53 pfrench joined #git
08:55 sawk joined #git
08:57 tristanp joined #git
08:58 ss22ever joined #git
08:58 S_Winner left #git
08:58 kexmex joined #git
08:59 ss22ever Hey anybody having experience in using git send-email
09:00 C0r3 joined #git
09:02 pfrench joined #git
09:08 pfrench joined #git
09:12 Vampire0_ joined #git
09:13 pfrench joined #git
09:14 SwiftMatt joined #git
09:15 thebird joined #git
09:23 King_Hual joined #git
09:26 wxg joined #git
09:31 MattMaker joined #git
09:31 venmx joined #git
09:34 kristofferR joined #git
09:36 alansaul joined #git
09:38 jnavila joined #git
09:39 dersand joined #git
09:45 nettoweb joined #git
09:46 systemovich joined #git
09:48 venmx joined #git
09:50 pfrench joined #git
09:51 hue joined #git
09:53 _ikke_ ss22ever: I haev
09:53 _ikke_ have
09:53 _ikke_ ss22ever: At least, a bit
09:54 overlord_tm joined #git
09:54 netj joined #git
09:56 Gloomy joined #git
09:58 nettoweb joined #git
09:58 ShekharReddy joined #git
09:59 a_thakur joined #git
10:00 a_thakur joined #git
10:02 blackwind_123 joined #git
10:04 pfrench joined #git
10:05 Darcidride joined #git
10:09 pfrench joined #git
10:11 humboldt joined #git
10:16 afuentes joined #git
10:16 david_raul joined #git
10:22 Tobbi joined #git
10:23 david__ joined #git
10:23 bannakaffalatta joined #git
10:24 julius joined #git
10:24 julius hi
10:25 julius by accident i added a .pyc file, since this is a binary file that will be recreated by python i dont want that in my repo. problem is that  when i run: git rm myfile.pyc myfile.pyc: needs merge
10:25 julius how can i skip the merge for this file?
10:26 _ikke_ git reset <file>
10:27 pfrench joined #git
10:31 sword joined #git
10:32 julius oh wait, now the file is actually gone
10:32 hhee joined #git
10:32 julius maybe git did remove it after all?
10:32 mablae_ joined #git
10:32 tvw joined #git
10:33 MattMaker joined #git
10:34 kexmex joined #git
10:34 moei joined #git
10:37 gtristan joined #git
10:41 pfrench joined #git
10:45 pfrench joined #git
10:46 oleksiyp joined #git
10:47 blackwind_123 joined #git
10:48 cbreak funny: https://arstechnica.com/security/2017/02/watershed-sha1-collision-just-broke-the-webkit-repository-others-may-follow :D
10:48 cbreak you couldn't even make a git repository containing that test case either though
10:48 cbreak (at least not with the raw pdfs)
10:48 `slikts left #git
10:49 mikecmpbll joined #git
10:49 mahakal joined #git
10:49 cbreak hmm... on the other hand: git blobs have a prefix, so the object hashes of the two PDFs might actually not collide.
10:52 mahakal joined #git
10:54 mahakal joined #git
10:56 pfrench joined #git
10:57 Murii_ joined #git
10:58 tristanp joined #git
10:59 Levex joined #git
11:00 nettoweb joined #git
11:01 me12345 joined #git
11:02 me12345 left #git
11:02 Drool joined #git
11:04 pfrench joined #git
11:05 jost joined #git
11:06 Impaloo joined #git
11:07 syg_ joined #git
11:07 finalbeta joined #git
11:07 Levex joined #git
11:07 _ikke_ cbreak: There is a whole thread on the mailing list about it
11:09 m0viefreak joined #git
11:09 pfrench joined #git
11:10 nd joined #git
11:10 kritzikratzi joined #git
11:10 nettoweb joined #git
11:15 pfrench joined #git
11:15 leeN joined #git
11:16 cbreak the making fun of svn part? :)
11:17 g105b joined #git
11:17 YuGiOhJCJ joined #git
11:20 chandu20 joined #git
11:21 alexandre9099_ joined #git
11:22 acidjnk22 joined #git
11:23 thebird joined #git
11:28 courrier joined #git
11:30 kexmex joined #git
11:33 MattMaker joined #git
11:35 robotroll joined #git
11:38 shinnya joined #git
11:38 pfrench joined #git
11:40 bvcosta joined #git
11:42 pfrench joined #git
11:43 acetakwas joined #git
11:44 Jackneill_ joined #git
11:44 alansaul joined #git
11:45 eroux joined #git
11:48 metalraiden34 joined #git
11:49 pfrench joined #git
11:50 jnavila joined #git
11:51 raijin joined #git
11:52 thebird joined #git
11:52 nothingnew joined #git
11:54 pfrench joined #git
11:54 iamashishkebab joined #git
11:55 treehug88 joined #git
11:55 gugah joined #git
11:56 courrier joined #git
11:57 ss22ever joined #git
11:58 pfrench joined #git
11:59 kachink joined #git
11:59 ss22ever _ikke_: still there?
12:00 doener joined #git
12:01 iamashishkebab3 joined #git
12:01 julius for ignoring a directory i was der the impression that a mydirectory/  in .gitignore would ignore that directory no matter in what subdirectory it appears. but now after adding _trial_tmp/ to .gitignore, commiting. git status still shows that it wants to add _trial_tmp ....why?
12:02 ss22ever _ikke_: The git send email showing me authentication required while configuring smtp. gmail.com as server
12:03 ismithers joined #git
12:03 pfrench joined #git
12:04 clickjack joined #git
12:04 oskarkv joined #git
12:04 ahr3n joined #git
12:09 pfrench joined #git
12:16 pfrench joined #git
12:16 blackwind_123 joined #git
12:17 alansaul_ joined #git
12:19 metalraiden34 joined #git
12:20 pfrench joined #git
12:22 CheckDavid joined #git
12:25 pfrench joined #git
12:28 packet0 joined #git
12:32 Masber joined #git
12:32 Levex joined #git
12:34 pfrench joined #git
12:36 Sleepy63 joined #git
12:38 xall joined #git
12:38 cbreak julius: git status, pastebin :)
12:43 pfrench joined #git
12:46 jimi_ joined #git
12:46 grayjoc joined #git
12:47 pfrench joined #git
12:52 pfrench joined #git
12:56 mizu_no_oto joined #git
12:57 julius cbreak, one second
12:58 venmx joined #git
12:58 XenophonF joined #git
12:58 julius cbreak, https://bpaste.net/show/630c7acfe3de
12:59 julius i changed the gitginore entry from _trial_tmp/, to **_trial_tmp/
12:59 julius still no luck
13:00 Salz lol, it should be _trial_temp/ (with e)?
13:00 thebird joined #git
13:04 Kristjan12 joined #git
13:04 ThomasTang joined #git
13:04 Kristjan12 Any sweet girls with big boobs and nice pussies wanna chat with a hot Estonian male(I am 33 years old)?
13:07 gopar joined #git
13:08 irqq joined #git
13:08 tyngdekraften joined #git
13:11 jameser joined #git
13:13 brent__ joined #git
13:14 aspiers joined #git
13:14 matthiaskrgr is it bad that some of the git commands (status and branch) seem to leak memory in the dev version?
13:14 _ikke_ ss22ever: gmail is not making it easy
13:15 _ikke_ ss22ever: They set very high security standards
13:16 olbat joined #git
13:16 _ikke_ ss22ever: Do you use 2nd factor authentication?
13:17 ss22ever _ikke_: Any solution I even turned on the app passwords and set the generated password  to the  git credential
13:19 pfrench joined #git
13:19 _ikke_ ss22ever: What are your current settings?
13:19 bvcosta joined #git
13:19 Richard_Cavell joined #git
13:20 muhannad_______ joined #git
13:20 Richard_Cavell How do I remove a directory that is versioned by git, such that git will remove it from the repository?
13:20 ss22ever _ikke_: can you have a look at the netstat
13:20 Mike11 joined #git
13:20 grawity Richard_Cavell: same as you would remove a file
13:20 grawity Richard_Cavell: do you want it to be removed from future commits, or also past ones?
13:20 Richard_Cavell No, just future
13:20 grawity ss22ever: can you show your current settings?
13:20 _ikke_ ss22ever: What netstat?
13:21 grawity Richard_Cavell: regular `git rm -rf` then
13:21 _ikke_ ss22ever: btw, I don't use gmail as smtp server myself, so I don't know how to solve it
13:21 Richard_Cavell fatal: pathspec 'Include' did not match any files
13:21 Richard_Cavell The directory is right there, I can see it
13:21 grawity then maybe it's not tracked
13:21 grawity note that Git doesn't track *empty* directories
13:21 grawity does it show up in `git ls-files` (the staging area)?
13:22 _ikke_ Richard_Cavell: To remove it from history, you have to rewrite the entire repository (from the point the dir was first introduced)
13:22 Richard_Cavell grawity: No.  I moved all the files from Include/ to Source/
13:22 Richard_Cavell So git doesn't version the directory itself?
13:22 grawity no it doesn't
13:23 grawity as far as Git cares, if a directory has nothing inside, it's not worth tracking (although technically that would be possible)
13:23 ss22ever _ikke_: pastebin.com/pFqE2fqp
13:23 grawity so if you mv'd or `git mv`'d all files out of it, that's all
13:23 grawity you don't need to manually remove the old dir
13:24 jameser joined #git
13:24 _ikke_ ss22ever: looks like it is not authenticating at all
13:25 grawity ss22ever: could you please pastebin the actual gitconfig settings
13:25 ss22ever _ikke_: but in the end it says authentication required
13:25 hyperair joined #git
13:25 _ikke_ ss22ever: Yes, but the client is never doing that
13:26 _ikke_ ss22ever: After the server advertises its capabilities, you see it's directly trying to send an e-mail (MAIL FROM ..)
13:26 ratdeptrai joined #git
13:27 _ikke_ ss22ever: So like grawity asks, what is your current configuration?
13:27 ss22ever grawity: pastebin.com/3yS0UvSY
13:27 jameser joined #git
13:28 grawity your smtpuser is under [sendmail], that's not correct
13:28 dvaske joined #git
13:29 ss22ever grawity:what it should be under
13:29 grawity [sendemail] like all the other smtp settings
13:29 xaviergmail joined #git
13:30 Gloomy joined #git
13:30 dreiss joined #git
13:31 ss22ever grawity: moreover is that case sensitive I found it somewhere smtpUser and somewhere smtpuser
13:31 grawity the setting names aren't case-sensitive
13:32 packet0 joined #git
13:33 ss22ever grawity: oh thankyou for the typo
13:34 ss22ever grawity: oh thankyou for the typo
13:34 jameser joined #git
13:35 MattMaker joined #git
13:37 ss22ever Hey now it says unable to initialize smtp I dont know whats wrong now
13:38 pfrench joined #git
13:38 david joined #git
13:39 Mike11 Hello all, I am using gitlab,  How can I force my forked repository to fetch from its upstream?
13:39 jameser joined #git
13:39 Mike11 I want to make sure everything is clean before merging
13:39 Mike11 **before starting a merge request**
13:41 _ikke_ Mike11: Just add another remote
13:44 iamashishkebab3 joined #git
13:45 Mike11 _ikke_ , should I add another remote to my local clone repo? is this the usual way to do this?!
13:46 Mike11 so my local repo now would have two remotes: 1) my forked repo. 2) its upstream
13:46 Mike11 is that what you meant?
13:46 d0nn1e joined #git
13:46 ss22ever Thanks guys started working
13:48 _ikke_ Mike11: correct
13:48 _ikke_ Mike11: You sync two remote repos locally
13:49 _ikke_ .version
13:49 Topic for #git is now Welcome to #git, the place for git help. Just git help, apparently. | We are aware of the SHA-1 collision. See: http://jk.gs/t/a4 | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.12.0 | Getting "cannot send to channel"? /msg gitinfo .voice | This is serious business. https://madeitwor.se/git-jokes
13:50 wouter0100 joined #git
13:50 Mike111 joined #git
13:50 ShapeShifter499 joined #git
13:53 iamashishkebab joined #git
13:54 Mike11 joined #git
13:55 Mike11 sorry, my internet connection went down, did I miss anything?
13:55 Mike11 _ikke_ ^^
13:56 Zarthus (14:48:25) <_ikke_> Mike11: correct
13:56 Zarthus (14:48:48) <_ikke_> Mike11: You sync two remote repos locally
13:56 Zarthus the last response
13:56 zeroed joined #git
13:56 zeroed joined #git
13:56 Mike11 Zarthus: thanks :D
13:57 Mike11 Zarthus: Just a question for naming style, what do you usually call the remote that tracks the forked upstream?
13:57 Zarthus My brain cannot brain the question right now.
13:57 Zarthus are you referring to just the upstream?
13:58 Mike11 Sorry, I mean, my local repo has a remote called origin that tracks the forked repository
13:58 Zarthus yes
13:58 Zarthus and the non-fork is what you're referring to?
13:58 Zarthus I call that the `upstream` remote, myself.
13:59 Mike11 and I need to add another remote that tracks my upstream (non-fork) repo, what do you usually call that remote
13:59 Mike11 mmm, thanks, that's it :)
13:59 dvaske joined #git
13:59 Zarthus Looks like you already know the answer yourself.
13:59 Mike11 I just wanted to make sure, since this the first time for me contributing, and I don't want to look stupid or strange because of something like this :)
14:00 Mike11 this is**
14:00 Mike11 thanks anyway, Zarthus :)
14:00 Mike11 left #git
14:00 Mike11 joined #git
14:03 TheWild joined #git
14:03 TheWild hello
14:03 m4sk1n joined #git
14:05 TheWild I have two repositories, which are supposed to be the same repository. How I can check that there is no difference between commits/branches?
14:06 ambro718 joined #git
14:07 ambro718 Hi, what's the best way to delete the top N commits? I would use rebase -i for this if it only allowed me to delete all the commits in the list.
14:07 traveller17 joined #git
14:08 ambro718 never mind figured it out ("drop" commit instead of deleting it)
14:09 overlord_tm joined #git
14:13 fanatic joined #git
14:13 dsdeiz joined #git
14:13 dsdeiz joined #git
14:14 pfrench joined #git
14:15 jnavila joined #git
14:15 ResidentBiscuit joined #git
14:16 qsx ambro718: man git-reset, !rewrite
14:16 gitinfo ambro718: Rewriting public history is not recommended. Everyone who has pulled the old history will have to do work (and you'll have to tell them to), so it's infinitely better to just move on. If you must, you can use `git push --force-with-lease <remote> <branch>` to force (and the remote may reject that, anyway). See http://goo.gl/waqum
14:16 gitinfo ambro718: the git-reset manpage is available at http://jk.gs/git-reset.html
14:17 xaa joined #git
14:22 ecuanaso joined #git
14:22 kexmex joined #git
14:23 Bombe joined #git
14:23 plos joined #git
14:24 pfrench joined #git
14:24 re1 joined #git
14:25 User458764 joined #git
14:25 oleksiyp joined #git
14:25 cr34ton joined #git
14:29 oleksiyp joined #git
14:33 zero1985 left #git
14:33 TheWild to compare repositories, is comparing the output of git ls-remote enough?
14:33 bvcosta joined #git
14:34 nd joined #git
14:35 blackwind_123 joined #git
14:35 dave0x6d joined #git
14:35 leeN joined #git
14:35 tvw joined #git
14:35 netj joined #git
14:36 MattMaker joined #git
14:36 xaviergmail joined #git
14:36 tvw joined #git
14:36 Atrumx joined #git
14:38 metalraiden34 joined #git
14:40 b100s joined #git
14:41 b100s hi2all
14:41 b100s is there recomended got work flow?
14:41 traveller17 left #git
14:42 pfrench joined #git
14:43 jnavila joined #git
14:43 Tobbi joined #git
14:45 bremner !workflow
14:45 gitinfo Finding the right workflow for you is critical for the success of any SCM project.  Git is very flexible with respect to workflow.  See http://sethrobertson.github.com/GitBestPractices/#workflow for a list of references about choosing branching and distributed workflows.
14:45 bremner b100s: ^
14:49 humboldt joined #git
14:49 dedicated_ joined #git
14:50 metalraiden34 joined #git
14:51 diogenese joined #git
14:51 dhollinger joined #git
14:51 PrashantJ joined #git
14:53 pfrench joined #git
14:59 DolpheenDream joined #git
15:01 tristanp joined #git
15:02 metalraiden34 joined #git
15:05 packet0 joined #git
15:11 trondth joined #git
15:14 Gustavo6046 joined #git
15:18 Endarked joined #git
15:18 fahadash joined #git
15:19 raman joined #git
15:20 muhannad_______ joined #git
15:21 ankit01ojha joined #git
15:25 marenz__ joined #git
15:26 angelsl joined #git
15:27 ChadTaljaardt joined #git
15:27 ChadTaljaardt Hello :)
15:28 gitinfo ChadTaljaardt: 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.
15:33 boubou joined #git
15:36 MattMaker joined #git
15:39 hashpuppy joined #git
15:41 TheWild some time ago I've asked here how I can force git to not me ask for login and password if from a batch script I want to pull from a repository that was public, but was removed.
15:42 TheWild I've used hack like writing a simple C program that prints two empty lines and using GIT_ASKPASS environment variable.
15:43 TheWild but the solution was to set GIT_TERMINAL_PROMPT = 0
15:44 _ikke_ TheWild: Oh nice
15:47 angelsl joined #git
15:47 j0y joined #git
15:47 madewokherd joined #git
15:47 b100s joined #git
15:49 Levex joined #git
15:49 dreiss joined #git
15:53 angelsl joined #git
15:55 publio joined #git
16:00 levex_ joined #git
16:03 Guest32701 joined #git
16:05 pfrench joined #git
16:12 thebope joined #git
16:12 venmx joined #git
16:12 cagmz joined #git
16:13 b100s bremner, thanks
16:14 ResidentBiscuit joined #git
16:16 bufferoverflow joined #git
16:22 PioneerAxon joined #git
16:23 irqq joined #git
16:26 thebope joined #git
16:27 heftig[m] joined #git
16:28 heftig[m] If git has two pack files containing the same object, is there any rule as to which copy will be read?
16:28 Levex joined #git
16:33 mikecmpbll joined #git
16:34 ayogi joined #git
16:36 _ikke_ Is this somehow related to the sha1 collision? (And I don't know the answer)
16:37 pfrench joined #git
16:38 MattMaker joined #git
16:40 skered joined #git
16:43 raspado joined #git
16:44 jimi_ joined #git
16:44 stfn joined #git
16:44 m4sk1n joined #git
16:44 webdev007 joined #git
16:45 shinnya joined #git
16:48 trewe joined #git
16:54 angelsl joined #git
16:57 hhee joined #git
16:59 pfrench joined #git
17:01 tristanp joined #git
17:02 bufferoverflow joined #git
17:02 texinwien_ joined #git
17:04 jstein_ joined #git
17:04 raspado joined #git
17:05 cdg joined #git
17:05 robotroll joined #git
17:06 dave0x6d joined #git
17:11 TheWild "git cat-file --batch" - When I send commit hash, I get the tree hash, parent hash, author name, commiter name and commit message.
17:11 pfrench joined #git
17:11 multi_io joined #git
17:11 TheWild then when I send tree hash, I'm getting... gibberish?
17:17 bufferoverflow joined #git
17:19 pfrench joined #git
17:21 gtristan TheWild, not sure I understand your problem but: A tree checksum is not an object, you can for instance checkout a commit checksum, but not a tree
17:21 Levex joined #git
17:22 bufferoverflow joined #git
17:24 qpdb joined #git
17:24 TheWild gtristan: got it. http://stackoverflow.com/questions/14790681/what-is-the-internal-format-of-a-git-tree-object
17:25 TheWild the thing was that git cat-file --batch, given hash that is a tree returns SHA1 checksums in binary
17:30 geoid_ joined #git
17:33 overlord_tm joined #git
17:34 safe joined #git
17:35 thebope joined #git
17:37 Levex joined #git
17:38 MattMaker joined #git
17:39 thebird joined #git
17:40 pfrench joined #git
17:44 YuGiOhJCJ joined #git
17:46 zero85 joined #git
17:47 DolpheenDream joined #git
17:50 pfrench joined #git
17:50 intellix joined #git
17:51 nilg joined #git
17:52 ecuanaso joined #git
17:53 Noldorin joined #git
17:54 stiven joined #git
17:55 sgtbigman joined #git
17:58 thebird joined #git
18:01 Tobbi joined #git
18:04 watabou joined #git
18:07 orbyt_ joined #git
18:07 Vauff_ left #git
18:08 dedicated joined #git
18:08 Vauff joined #git
18:10 ankit01ojha joined #git
18:11 shgysk8zer0_ joined #git
18:14 User458764 joined #git
18:14 User458764 joined #git
18:15 tmsmith joined #git
18:15 Darren_ joined #git
18:17 oleksiyp joined #git
18:17 canton7 joined #git
18:19 Goplat joined #git
18:20 bgerber joined #git
18:21 ankit01ojha joined #git
18:22 Oatmeal joined #git
18:24 hasc joined #git
18:25 tvw joined #git
18:27 cdg joined #git
18:29 SpeakerToMeat joined #git
18:30 Panacea joined #git
18:30 pks joined #git
18:31 cdesai_ joined #git
18:31 thebope joined #git
18:32 watabou joined #git
18:33 joeco joined #git
18:35 Tobbi joined #git
18:38 gugah joined #git
18:39 sgen joined #git
18:39 acidjnk22 joined #git
18:39 pur3eval joined #git
18:40 fatalhalt joined #git
18:42 _ikke_ A tree object is a binary object
18:42 _ikke_ Not ascii
18:43 pfrench joined #git
18:45 cr34ton joined #git
18:45 Eugene ur an object
18:45 _ikke_ thanskl
18:47 cdg joined #git
18:50 joeco joined #git
18:51 venmx joined #git
18:51 Murii_ joined #git
18:55 retroj joined #git
18:58 Puppet__ joined #git
19:01 pks joined #git
19:02 tristanp joined #git
19:03 rgrinberg joined #git
19:03 dedicated_ joined #git
19:05 variable joined #git
19:07 grayjoc joined #git
19:11 svm_invictvs joined #git
19:13 dreiss joined #git
19:14 Abbott joined #git
19:15 Abbott Would it be a bad idea to manage a KeePass database file with git?
19:15 bekks Yes.
19:16 bekks Because it isnt necessary, since keepass tracks a history in that file itself.
19:16 phy1729 It'd probably be better to do git inside an encrypted container rather than an encrypted container in git
19:16 bekks Abbott: Just use the lastest version: https://www.keepassx.org/
19:18 wongon joined #git
19:18 qsx or use pass, which already uses git
19:18 Abbott bekks what do you mean? I think I am using the latest version. My problem is I have kdbx files on five different devices and if I add a password on one, I have to push to google drive, then make sure I download it on all devices
19:19 Abbott Is there a feature or something I'm missing?
19:19 bekks Abbott: Yes. And using git, you need to push/pull them. So what?
19:20 retroj joined #git
19:20 spm_draget left #git
19:20 Abbott bekks because sometimes I forget to download a new kdbx before I add a password, so when I upload to Google drive I overwrite the old one and lose the first password I created, versus with git it would tell me to merge
19:20 pfrench joined #git
19:20 bekks Abbott: you can merge kdbx files.
19:21 ResidentBiscuit joined #git
19:21 bekks Abbott: Thats a builtin feature already. And since keepassx files arent plain text, you cannot merge them using git.
19:21 hussam joined #git
19:23 user-and-abuser joined #git
19:24 Abbott bekks right I wouldn't use the actual merge functionality of git, just the version tracking. Like the warning to merge on its own would be helpful enough. With merging kdbx files it's just a fancy copy paste of entries isn't it? And overwriting a kdbx file wouldn't tell me I needed to merge or anything
19:24 bekks Abbott: No. It has a functionality for merging.
19:24 _ikke_ Abbott: keepass has an option to merge databases itself
19:24 Murii_ joined #git
19:24 bekks Select two kdbx files, merge them.
19:25 thebope joined #git
19:26 mrom joined #git
19:26 ispn joined #git
19:27 WayToDoor joined #git
19:27 Abbott Alright I will see if that makes things easier
19:27 xaviergmail joined #git
19:27 Abbott Thanks guys
19:28 johnnyfive joined #git
19:31 jnewt joined #git
19:35 webdev007 joined #git
19:36 Emperor_Earth joined #git
19:38 Casper joined #git
19:39 MattMaker joined #git
19:40 rxo_ joined #git
19:43 cdown joined #git
19:45 evie_hammond joined #git
19:46 pfrench joined #git
19:50 Darren_ joined #git
19:51 ecuanaso joined #git
19:52 cdg_ joined #git
19:55 tyngdekraften left #git
19:57 svm_invictvs joined #git
19:57 matoro joined #git
19:57 Zwelf joined #git
19:59 heroux joined #git
19:59 dsdeiz joined #git
19:59 dsdeiz joined #git
20:00 thebird joined #git
20:03 dedicated joined #git
20:03 tristanp joined #git
20:03 aw1 joined #git
20:03 kbs joined #git
20:03 LiftLeft joined #git
20:08 chuzhoy joined #git
20:09 johnny56 joined #git
20:10 watabou joined #git
20:11 ash_workz joined #git
20:13 ash_workz joined #git
20:13 thebope joined #git
20:18 bvcosta joined #git
20:19 pfrench joined #git
20:21 adymitruk is it me or is this watershed thing blown out of proportion? would you not be able to almost immediately tell if someone pushed something that was clobbering another object?
20:22 adymitruk I mean in terms of its impact on git repositories specifically
20:23 adymitruk I'm happy to force-push when SHA3 is used instead, but there is no burning emergency in my mind
20:23 _ikke_ adymitruk: The git devs also don't see any reason to rush (but still continue efforts to switch)
20:24 adymitruk now in terms of SVN and the way that's architected, there is an immediate concern, correct?
20:24 adymitruk this is because of the lack of a header that's added to blobs?
20:25 _ikke_ I don't know enough about svn to say anything about it
20:25 _ikke_ But note that this is still not a pre-image attack
20:26 adymitruk _ikke_: ie, pre image where you can put in /anything/ you want to inject, correct?
20:26 _ikke_ adymitruk: That you can create a collision for existing data
20:26 adymitruk .. after an initial first X bytes
20:26 adymitruk oh
20:26 adymitruk so it's not easy to say I can find an alternate blob to kill this exact one
20:27 adymitruk so what hackes must do is DL a TON of repos, then iterate on them and hope they find a hit
20:27 adymitruk once they do they can explore what pushing that object to that repo would do, correct?
20:28 adymitruk and at this point it's just corrution and you can't substitute any payload of your liking, right?
20:30 _ikke_ adymitruk: Most likely
20:30 dgonzo joined #git
20:30 _ikke_ And note that if they try to push an existing blob, git will just use the existing one, not overwrite it
20:32 venmx joined #git
20:34 Cassiopaya joined #git
20:37 ResidentBiscuit joined #git
20:38 matoro joined #git
20:40 rivarun joined #git
20:40 courrier joined #git
20:41 MattMaker joined #git
20:42 pfrench joined #git
20:44 stfn joined #git
20:45 Sasazuka joined #git
20:48 rivarun joined #git
20:48 mehola joined #git
20:50 venmx joined #git
20:52 boombatower joined #git
20:53 stfn joined #git
20:56 oleksiyp joined #git
20:56 Cabanossi joined #git
20:57 justan0theruser joined #git
20:58 axisys joined #git
20:58 jnavila joined #git
20:59 chuzhoy left #git
21:00 kbs joined #git
21:01 kexmex joined #git
21:02 pfrench joined #git
21:04 Cabanossi joined #git
21:06 arand__ joined #git
21:06 johnny56 joined #git
21:06 adymitruk right
21:06 finalbeta joined #git
21:07 adymitruk it seems like the only way to make use of this to kill svn is to push those 2 exact pdfs that were published as proofs of collision
21:07 adymitruk but since git prefixes the blob with a header, it doesn't apply
21:07 adymitruk correct?
21:07 _ikke_ That might indeed be the case
21:08 _ikke_ That shifts the bits
21:09 adymitruk I'm getting pesterd by the people I work with to dig into this :) thank you for your help
21:09 byte512 joined #git
21:10 CheckDavid joined #git
21:11 _ikke_ heh
21:13 _ikke_ adymitruk: https://public-inbox.org/git/937d395f-77fe-b275-6cbe-f3477e24cd2f@gmail.com/T/#t
21:13 _ikke_ Biggish thread from the git devs about the implications
21:13 kbs I found the linus post (from his perspective) useful as well, https://plus.google.com/+LinusTorvalds/posts/7tp2gYWQugL
21:14 _ikke_ kbs: thanks
21:17 p3m joined #git
21:18 Eugene !sha1
21:18 gitinfo Git's usage of SHA1 hashes is largely immune to collisions because it includes a file-length header. Other protections and an eventual update to a new hashing algorithm are planned. http://marc.info/?l=git&amp;m=148787047422954. Constructing an actual SHA1 collision is still very expensive, and accidental encounters are less likely than random wolf attacks. Fear their howl.
21:19 Eugene .trigger_edit sha1 Git's usage of SHA1 hashes is largely immune to collisions because it includes a file-length header. Other protections and an eventual update to a new hashing algorithm are planned. https://plus.google.com/+LinusTorvalds/posts/7tp2gYWQugL. Constructing an actual SHA1 collision is still very expensive, and accidental encounters are less likely than random wolf attacks. Fear their howl.
21:19 gitinfo Eugene: Okay.
21:20 Atm0spher1c joined #git
21:21 kbs fwiw, the file-length header remark looks off - I think the g+ post has a more balanced look at implicatons
21:21 Eugene Its a not-quite-correct one-sentence summary which references a longer more-detailed post
21:21 Eugene Its fine
21:23 Eugene If you can suggest a more concise summary, please do
21:23 marenz__ joined #git
21:25 WizJin joined #git
21:26 ecuanaso joined #git
21:27 Urbany joined #git
21:27 Sample joined #git
21:28 xaviergmail joined #git
21:28 kbs wdyt about "Git is transitioning to a stronger hash than SHA1, but the sky isn't falling. <link>"
21:28 [Brain] joined #git
21:29 roxlu joined #git
21:30 MattMaker joined #git
21:31 pfrench joined #git
21:32 kyan joined #git
21:34 EV3RYDAYPR0GRESS joined #git
21:39 metalraiden34 joined #git
21:39 p3m joined #git
21:43 Eugene .trigger_edit sha1 Git's usage of SHA1 hashes is resistant to most attack vectors. Additional mitigations and an eventual migration to other hash algorithms are planned. https://plus.google.com/+LinusTorvalds/posts/7tp2gYWQugL. Constructing an actual SHA1 collision is still very expensive, and accidental encounters are less likely than random wolf attacks. Fear their howl.
21:43 gitinfo Eugene: Okay.
21:43 Tobbi joined #git
21:44 kbs +1 :)
21:45 duderonomy joined #git
21:46 heroux joined #git
21:47 wcpan joined #git
21:48 shgysk8zer0_ joined #git
21:50 aidalgol joined #git
21:51 archaic joined #git
21:56 aw1 joined #git
21:59 Forbidd3n joined #git
22:00 aidalgol joined #git
22:00 Forbidd3n How would I get git to check for ssh keys in /home/user/.ssh dir?
22:02 _ikke_ Forbidd3n: git leaves that up to ssh
22:02 Goplat joined #git
22:03 Forbidd3n _ikke_: I believe it looks in the /etc/ssh dir by default, correcT?
22:03 Forbidd3n I have the key in /home/myuserdir/.ssh
22:04 tristanp joined #git
22:04 Forbidd3n I guess I can put it in the ssh_config file
22:04 _ikke_ /home/myuserdir/.ssh/config
22:05 Forbidd3n there is no config file, I guess create it?
22:05 Forbidd3n let me tias
22:06 _ikke_ yup
22:07 peterbecich joined #git
22:08 Forbidd3n _ikke_: is it config or ssh_config?
22:08 _ikke_ config
22:09 Forbidd3n still getting error that correct access rights when trying to push or pull bitbucket I have the public key in bitbucket and the config file is pointing to the correct file
22:10 _ikke_ Forbidd3n: What did you put in the file?
22:11 raynold joined #git
22:11 Forbidd3n _ikke_: http://pastebin.com/34y95sTS
22:12 LiMp^ joined #git
22:12 _ikke_ Looks good, note that hostname is redudant
22:13 Forbidd3n yeah I corrected that
22:13 Forbidd3n do I have to restart sshd ?
22:13 _ikke_ Forbidd3n: What happens if you do ssh -vvT git@bitbucket.org
22:13 rj1 joined #git
22:13 lektrik joined #git
22:13 Forbidd3n ahh does the key have to be root user and group
22:13 Forbidd3n Bad owner or permissions on /home/rewards/.ssh/config
22:14 _ikke_ Forbidd3n: private key should only be readable by the user
22:14 Forbidd3n yeah it is
22:14 Forbidd3n perms are 644
22:14 _ikke_ 600
22:14 Forbidd3n on key and config?
22:14 _ikke_ 644 means world readable
22:14 _ikke_ only key
22:15 pur3eval joined #git
22:15 lowercaseman joined #git
22:18 SwiftMatt joined #git
22:19 am55 joined #git
22:26 heroux joined #git
22:28 jimi_ joined #git
22:30 xaviergmail joined #git
22:33 pfrench joined #git
22:36 nevodka joined #git
22:38 robattila256 joined #git
22:41 Tee_Pee Hey guys, quick question
22:41 Tee_Pee I cloned a repo that has since gotten new branches, but those branches don't appear in my cloned version of the repo
22:41 Tee_Pee How can I update it?
22:44 Tee_Pee Got iot
22:44 Tatou Tee_Pee: checkout *branchname*
22:44 Tee_Pee Yeah just figured it out
22:45 Tee_Pee I always thought that once I do git fetch RemoteRepo, it would sync up all the new branches to my own fork
22:46 muxq joined #git
22:46 Levex joined #git
22:47 Tee_Pee Actually no, this didn't work
22:47 Tee_Pee I did "git branch MyBranch Remote/MyBranch"
22:48 Tee_Pee Switched to it, did my things, tried pushing it, and it told me "remote: repository not found
22:48 Tee_Pee as if I'm on Remote/MyBranch
22:53 pfrench joined #git
22:54 tsdev joined #git
22:54 ozmage joined #git
22:54 Levex joined #git
23:01 fmeerkoetter joined #git
23:01 nedbat Tee_Pee: use:  git checkout MyBranch
23:02 nedbat Tee_Pee: you said you did that, but then you showed "git branch ... " instead
23:02 Tee_Pee Yeah, I did git branch to create MyBranch, then did git checkout MyBranch
23:02 aw1 joined #git
23:02 Tee_Pee did my changes, then tried to push it
23:02 nedbat Tee_Pee: git checkout -b MyBranch
23:02 pfrench joined #git
23:03 DolpheenDream joined #git
23:03 ccccc joined #git
23:04 Tee_Pee I think that did the trick
23:05 Tee_Pee Yup, you're my savior
23:05 Tee_Pee Thanks.
23:06 BenderRodriguez joined #git
23:11 cdg joined #git
23:13 r_rios joined #git
23:14 peterbecich joined #git
23:14 r_rios Hello, all. Is there a way to preserve the tags with git submodule
23:14 brent__ joined #git
23:17 justanotheruser joined #git
23:17 peterbecich joined #git
23:17 durham joined #git
23:18 r_rios By default, git submodule preserves the history of the subdirectory, but not the tags attached to some commits
23:18 metalraiden34 joined #git
23:19 tristanp joined #git
23:20 kadoban r_rios: If you want the tags, you can just fetch them separately really. I don't know submodule enough to know if there's a flag to have it do that automatically, usually it doesn't make a ton of sense I don't think.
23:21 r_rios What do you mean by "fetch them separately"?
23:22 kadoban r_rios: 'git fetch --tags whateverremote'
23:23 r_rios I want to associate the tags to the commits in the new branch, created by git submodule
23:23 r_rios I don't know if that's possible automatically. It makes sense in my case
23:24 durham joined #git
23:24 r_rios By doing git fetch --tags, the tags remain in the original tree history, not in the new history, which is what I want
23:25 grumble joined #git
23:26 peterbecich joined #git
23:26 hfp joined #git
23:27 hfp_work joined #git
23:27 Tee_Pee Heya, me again (troubles never end) - I got a folder that appears under git status as SomeFolder/  (it's untracked, doesn't exist on the remote or any local commits)
23:27 Tee_Pee I can't modify the .gitignore so I added SomeFolder/ in my .git/info/exclude
23:27 Tee_Pee However, that does nothing, it still shows up under git status
23:28 nedbat Tee_Pee: why can't you change the .gitignore?
23:29 sinmao joined #git
23:29 Starky joined #git
23:31 Tee_Pee Well, it's a bit stupid. It's a fork of the Unreal Engine, right?
23:31 Tee_Pee They have their own gigantic codebase and their own engine .gitignore
23:32 pbrewczynski joined #git
23:32 Tee_Pee But they require game folders to be a subfolder in the engine root.
23:32 Tee_Pee So I got a Games folder, but not everyone will have that, so when I do pull requests against their repo, I don't want my gitignore or Games folder to show up
23:32 venmx joined #git
23:32 Tee_Pee Essentially, they don't want us to pollute their .gitignore but they require us to have local subfolders in our repo
23:33 mehola joined #git
23:39 Starky joined #git
23:40 hahuang65 joined #git
23:41 shgysk8zer0_ joined #git
23:42 Tee_Pee So, no idea why the info/exclude might not be working correctly?
23:46 _xor joined #git
23:47 Gustavo6046 joined #git
23:49 ThatBob9001 joined #git
23:50 Endarked joined #git
23:50 svm_invictvs joined #git
23:54 pfrench joined #git
23:57 Gustavo6046 joined #git
23:58 pfrench joined #git

| Channels | #git index | Today | | Search | Google Search | Plain-Text | summary