Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2017-02-05

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

All times shown according to UTC.

Time Nick Message
00:01 matoro joined #git
00:03 dsdeiz joined #git
00:03 dsdeiz joined #git
00:07 zezba joined #git
00:08 crundar I'd like to use the git-lfs-convert tool that I've seen around the net a couple of times, but the manual suggesting usage for the tool isn't clear enough for me to understand, and I'd rather not try and work my way through the source.
00:08 Singmyr joined #git
00:08 crundar Could someone with some experience help me to understand the parameters?
00:09 crundar It seems to want -s source -d destination and either -g for a github repo with the same name as that destination, or -l for an lfs site, maybe a test site.
00:09 endiruna joined #git
00:09 jameser joined #git
00:10 crundar I'm coming from an enterprise git solution and I'd like to go to real github, but it signaled an error when I tried to run the conversion utility.
00:11 BenderRodriguez joined #git
00:11 ResidentBiscuit joined #git
00:20 cjohnson joined #git
00:27 miczac joined #git
00:29 adymitruk is there a way to configure git to always --no-ff on all merges except if you are merging a remote tracking branch of the same name?
00:30 adymitruk ie, I want a merge commit always, but not if I'm splitting a pull to a separate fetch and merge and have nothing locally to merge
00:31 spacelord_ joined #git
00:31 crundar Ah, I got it. The url specified in the -g pattern has to already exist.
00:35 Atrumx joined #git
00:36 rewt adymitruk, you can set global option merge.ff=false to have it default to -no-ff; and i do a rebase to "catch up" my local branch to its upstream counterpart if it's behind/diverged (changing local history for commits that have not been pushed is ok)
00:37 adymitruk we don't do much rebaing.. so there is the chance that the rest will polute the repo with extra merge commits
00:37 Uma joined #git
00:38 rewt if you haven't pushed the commits, rebase will not pollute anything
00:40 BackEndCoder joined #git
00:43 jameser joined #git
00:44 ResidentBiscuit joined #git
00:44 lektrik joined #git
00:47 mischat joined #git
00:50 nd_ joined #git
00:50 cyphase_eviltwin joined #git
00:54 harry2 joined #git
00:55 brent__ joined #git
00:56 adymitruk we don't rebase. the merges where a --ff-only was forgotten will make an extra commit
00:57 adymitruk another question: why does he %d expansion of decorate not encode the different colours for branch, remotebranch, etc
00:59 raynold ahh it's a wonderful day
00:59 adymitruk ie, if you use the default log, --decorate will give diffferent colours
00:59 jameser joined #git
01:02 DaziNik joined #git
01:05 matoro joined #git
01:10 cagmz joined #git
01:14 nowhereman joined #git
01:20 jgrasser joined #git
01:22 spitfireee joined #git
01:28 ResidentBiscuit joined #git
01:33 ShalokShalom joined #git
01:33 zezba joined #git
01:34 glebihan_ joined #git
01:35 jameser joined #git
01:43 rosario joined #git
01:44 reepca joined #git
01:45 reepca Ugh, so on git for windows a friend of mine tried pushing to github and was prompted for a username and password, then entered the incorrect username. Now git push always fails and he can't re-enter the credentials.
01:46 reepca (and of course, the internet is flooded with people trying to get git to stop asking for authentication, so searching there wasn't any help)
01:46 rewt have him check his C:\Users\<username>\.gitconfig file
01:47 RainMan28 left #git
01:47 rosario Hi. When you have some files with “assumed unchanged” changes, is there an easy way to see the diff of those changes? Ideally just those changes, but including them in the whole `git diff` would also help.
01:49 mischat joined #git
01:56 shriek joined #git
02:04 pks joined #git
02:06 rosario joined #git
02:07 quackgyver joined #git
02:09 bernardio joined #git
02:09 adymitruk reepca: switch them to SSH
02:10 raijin joined #git
02:10 a_thakur joined #git
02:11 reepca adymitruk: already tried that, same result.
02:11 jameser joined #git
02:11 reepca except it said that github's key or something couldn't be verified and we had to accept it
02:11 reepca (the standard message when you first ssh to something)
02:12 adymitruk did you set a password on the key?
02:12 adymitruk don't create a key with a password
02:12 mehola joined #git
02:12 cdown joined #git
02:13 adymitruk BTW, here's my little bit of Git Tips :) Please let me know if there are many mistakes or if I should add some things..
02:13 mehola joined #git
02:13 adymitruk https://adaptechsolutions.net/git-pro-tips/
02:13 pur3eval joined #git
02:14 mehola joined #git
02:14 mehola joined #git
02:15 mehola joined #git
02:16 mehola joined #git
02:17 mehola joined #git
02:17 finalbeta joined #git
02:18 mehola joined #git
02:19 mehola joined #git
02:19 coasterz joined #git
02:24 menip joined #git
02:24 nevodka joined #git
02:27 texasmynsted joined #git
02:28 isysd joined #git
02:29 jagobdue joined #git
02:30 ismithers joined #git
02:35 rivarun joined #git
02:40 Vampire0 joined #git
02:41 ResidentBiscuit joined #git
02:41 DieguezZ joined #git
02:42 JamesBaxter joined #git
02:47 Noldorin joined #git
02:47 anuxivm joined #git
02:47 harry2 joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and alternative commits | 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 | git-slushie: submit your best punch line to https://madeitwor.se/git-jokes
02:49 mischat joined #git
02:49 lindenle joined #git
02:50 Derperperd joined #git
03:03 d^sh joined #git
03:03 govg joined #git
03:04 fstd_ joined #git
03:04 pks joined #git
03:05 kadoban adymitruk: If 'git status' is too verbose, you're probably not commiting often enough, or maybe you should be using .gitignore or a similar ignore/exclude feature. Also the "No back merges" thing seems like it heavily depends on your workflow, that's far from the first rule I'd come up with.
03:11 texasmynsted left #git
03:14 krillr joined #git
03:15 tmcmahon joined #git
03:17 Vortex34 joined #git
03:19 mehola joined #git
03:20 solenodic joined #git
03:27 arescorpio joined #git
03:27 netj joined #git
03:32 pabs3 joined #git
03:32 Gsham joined #git
03:37 RickyB98 joined #git
03:37 RickyB98 joined #git
03:37 Bilge joined #git
03:37 BlessJah joined #git
03:37 blackwind_123 joined #git
03:38 tgy joined #git
03:39 r3c0d3x joined #git
03:42 demize joined #git
03:44 mizu_no_oto joined #git
03:47 sunri5e joined #git
03:48 chachasmooth joined #git
03:49 a_thakur joined #git
03:50 mischat joined #git
03:51 vrishab joined #git
03:53 hexagoxel joined #git
03:54 zezba_ joined #git
03:57 ismithers joined #git
03:59 chandu20 joined #git
03:59 prg3 joined #git
04:00 markelite joined #git
04:02 pur3eval joined #git
04:02 solenodic joined #git
04:02 pur3eval joined #git
04:14 xlegoman joined #git
04:21 nckpz joined #git
04:21 solenodic joined #git
04:27 Nilesh_ joined #git
04:31 brewmaster joined #git
04:32 zezba joined #git
04:32 thebinary joined #git
04:32 harry2 joined #git
04:34 raijin joined #git
04:34 anuxivm left #git
04:36 a_thakur joined #git
04:36 kasual joined #git
04:38 a_thakur_ joined #git
04:39 basiclaser joined #git
04:40 oskarkv joined #git
04:40 armyriad joined #git
04:41 dsdeiz joined #git
04:41 dsdeiz joined #git
04:42 ljc joined #git
04:42 p4trix joined #git
04:43 Cabanoss- joined #git
04:49 mohabaks joined #git
04:51 mischat joined #git
04:52 Derperperd joined #git
04:53 cvn57l1sddk42ljq joined #git
04:57 SwiftMatt joined #git
05:00 ryxxed joined #git
05:01 dermoth joined #git
05:02 solenodic joined #git
05:06 menip joined #git
05:09 drodger joined #git
05:20 mehola joined #git
05:21 solenodic joined #git
05:23 mizu_no_oto joined #git
05:25 shinnya joined #git
05:31 watabou joined #git
05:31 jameser joined #git
05:34 lindenle joined #git
05:34 diogenese joined #git
05:35 BenderRodriguez joined #git
05:35 atomi joined #git
05:39 mohabaks joined #git
05:41 kasual_ joined #git
05:44 jameser joined #git
05:45 chandu20 joined #git
05:49 enterdef joined #git
05:49 dadilla joined #git
05:49 kolllak joined #git
05:49 tmNixoN joined #git
05:49 robot joined #git
05:49 PostDE joined #git
05:49 syspass joined #git
05:49 OceanXXX joined #git
05:49 dofti joined #git
05:49 chmoka joined #git
05:49 Pokabraz joined #git
05:49 division joined #git
05:49 Guest35724 joined #git
05:49 Tochya joined #git
05:49 almost joined #git
05:49 Asthma joined #git
05:49 donbjohnston joined #git
05:49 skillz joined #git
05:49 MakRyck joined #git
05:49 AtmacA joined #git
05:49 Yascherica joined #git
05:49 razrushitel joined #git
05:49 dolphin joined #git
05:49 hamel joined #git
05:49 frozn joined #git
05:49 photoshop joined #git
05:49 TechnoLog joined #git
05:49 Feniks joined #git
05:49 livewemust joined #git
05:49 ducati joined #git
05:49 FLCL joined #git
05:49 UPS joined #git
05:49 Mouder joined #git
05:49 mitchell joined #git
05:49 Guest92986 joined #git
05:49 Bare joined #git
05:49 cesarton joined #git
05:49 QzuTTo joined #git
05:49 deadman joined #git
05:49 DoubT joined #git
05:49 wwaatt joined #git
05:49 pikefish joined #git
05:49 Perregaux joined #git
05:49 acidlover joined #git
05:49 Chilean joined #git
05:49 eloton joined #git
05:49 Frederick joined #git
05:49 Karazhan joined #git
05:50 brainsucker joined #git
05:50 amsty joined #git
05:50 lol_lilo joined #git
05:51 chipotle joined #git
05:51 Pestilence joined #git
05:51 DioSoft joined #git
05:51 neutrino joined #git
05:51 kriskringle joined #git
05:51 GrodGod joined #git
05:51 wesTT joined #git
05:52 mischat joined #git
05:54 hvxgr joined #git
05:54 fahadash joined #git
05:56 zezba joined #git
05:57 msonntag joined #git
06:02 solenodic joined #git
06:03 ertes joined #git
06:05 shgysk8zer0_ joined #git
06:09 navidr joined #git
06:09 ertes joined #git
06:10 freimatz joined #git
06:11 staafl Hi y'all, is there a tool you can use to visualize the contents of a git repo database (objects, trees, commits etc)?
06:11 seni joined #git
06:14 ShalokShalom joined #git
06:17 osxi joined #git
06:21 harry2 joined #git
06:23 seni joined #git
06:28 jameser joined #git
06:31 a_thakur joined #git
06:31 jameser joined #git
06:32 a_thakur joined #git
06:33 reepca joined #git
06:42 jameser joined #git
06:42 solenodic joined #git
06:44 adymitruk kadoban: Thanks. Agreed. sometimes though, getting a repo from someone else you have to deal with things like this
06:44 lindenle joined #git
06:47 llamapixel staafl: win dir stat / grand perspective will give you a visual layout of the files but it may not be enough
06:48 llamapixel http://grandperspectiv.sourceforge.net/
06:48 llamapixel https://windirstat.net/
06:49 llamapixel http://gdmap.sourceforge.net/
06:52 jgrasser joined #git
06:52 pur3eval joined #git
06:53 mda1_ joined #git
06:54 Derperperd joined #git
07:02 jameser joined #git
07:07 staafl llamapixel, thank you!
07:07 llamapixel np
07:21 pur3eval joined #git
07:22 Chia joined #git
07:22 Chia left #git
07:30 jameser joined #git
07:39 jameser joined #git
07:46 checkItOut joined #git
07:52 umpc left #git
07:53 King_Hual joined #git
07:53 King_Hual joined #git
07:53 mischat joined #git
07:54 Cabanossi joined #git
07:56 endiruna joined #git
07:57 checkItOut joined #git
08:02 Murii joined #git
08:05 blackwind_123 joined #git
08:06 a_thakur joined #git
08:07 a_thakur joined #git
08:09 justanotheruser joined #git
08:10 harry2 joined #git
08:15 Guest30_ joined #git
08:19 a_thakur joined #git
08:22 a_thakur joined #git
08:24 SwiftMatt joined #git
08:25 a_thakur joined #git
08:26 a_thakur_ joined #git
08:31 InfoTest joined #git
08:32 pur3eval joined #git
08:32 PioneerAxon joined #git
08:39 a3Dman joined #git
08:39 a3Dman joined #git
08:40 Masber joined #git
08:43 Guest30_ joined #git
08:48 rivarun joined #git
08:49 thierryp joined #git
08:50 A124 joined #git
08:54 m4sk1n joined #git
08:54 mischat joined #git
08:54 Derperperd joined #git
08:57 Juzzika joined #git
08:57 checkItOut joined #git
09:05 shinnya joined #git
09:05 masuberu joined #git
09:06 jagob joined #git
09:06 __main__ joined #git
09:07 osxi joined #git
09:09 robotroll joined #git
09:16 GodEater` left #git
09:17 GodEater joined #git
09:17 GodEater joined #git
09:21 a_thakur joined #git
09:27 slappymcfry joined #git
09:30 _noblegas joined #git
09:30 zerorax joined #git
09:32 bannakaffalatta joined #git
09:34 mehola joined #git
09:36 a3Dman joined #git
09:38 FilipNortic joined #git
09:41 Murii joined #git
09:42 ResidentBiscuit joined #git
09:45 SteffanW joined #git
09:47 jameser joined #git
09:51 miczac joined #git
09:55 rumble joined #git
09:55 mischat joined #git
09:59 harry2 joined #git
09:59 unreal joined #git
10:00 YuGiOhJCJ joined #git
10:04 InfoTest joined #git
10:04 a0x10c joined #git
10:04 solenodic joined #git
10:06 solenodic joined #git
10:08 byte512 joined #git
10:11 robattila256 joined #git
10:12 seni joined #git
10:12 dhollinger joined #git
10:19 a_thakur joined #git
10:22 satifant joined #git
10:24 catsup joined #git
10:24 SwiftMatt joined #git
10:25 catsup joined #git
10:25 solenodic joined #git
10:27 overlord_tm joined #git
10:29 manuelschneid3r joined #git
10:29 brent__ joined #git
10:32 Puffball joined #git
10:34 dsdeiz joined #git
10:36 sq-one joined #git
10:38 [0xAA] joined #git
10:39 sagerdearia joined #git
10:46 rivarun joined #git
10:47 lindenle joined #git
10:49 rainervonvielen joined #git
10:50 cs_shadow joined #git
10:50 joki joined #git
10:52 Jackneill joined #git
10:53 ThomasLocke_ joined #git
10:55 Derperperd joined #git
10:55 Derperperd joined #git
10:56 mischat joined #git
11:02 spacelord_ joined #git
11:04 fhackdroid joined #git
11:05 irqq_ joined #git
11:05 digidog joined #git
11:06 Sonderblade joined #git
11:09 dersand joined #git
11:12 tt joined #git
11:12 cdown joined #git
11:13 bannakaf_ joined #git
11:14 tt left #git
11:16 Derperperd joined #git
11:22 bannakaffalatta joined #git
11:24 Masber joined #git
11:27 Tobbi joined #git
11:30 jsolano joined #git
11:32 jost_ joined #git
11:32 Antimachine joined #git
11:39 pabs3 left #git
11:42 bannakaf_ joined #git
11:45 jsolano joined #git
11:46 adamru joined #git
11:47 solenodic joined #git
11:48 harry2 joined #git
11:53 ertesx joined #git
11:53 djb-irc joined #git
11:54 wiesel joined #git
11:57 mischat joined #git
12:01 evie_hammond joined #git
12:04 a_thakur joined #git
12:04 a_thakur joined #git
12:07 blackwind_123 joined #git
12:12 cdown joined #git
12:14 pks joined #git
12:17 a_thakur joined #git
12:17 Derperperd joined #git
12:18 aard_ joined #git
12:18 beuker joined #git
12:19 kaldoran joined #git
12:20 sim590 joined #git
12:22 Hudu joined #git
12:25 cdown joined #git
12:28 Ronny007 joined #git
12:33 CheckDavid joined #git
12:38 cdown joined #git
12:43 solenodic joined #git
12:45 brent__ joined #git
12:45 nowhereman joined #git
12:54 Ryanar joined #git
13:00 m0viefreak joined #git
13:03 raijin joined #git
13:04 Vinnie_win_j joined #git
13:09 leeN joined #git
13:12 brent__ joined #git
13:18 p4trix joined #git
13:18 mehola joined #git
13:19 jimi_ joined #git
13:22 isysd joined #git
13:23 dsdeiz joined #git
13:23 dsdeiz joined #git
13:24 cdown joined #git
13:27 pbrewczynski joined #git
13:28 overlord_tm joined #git
13:30 mda1 joined #git
13:30 User458764 joined #git
13:36 harry2 joined #git
13:42 DieguezZ joined #git
13:43 ResidentBiscuit joined #git
13:49 astrofog joined #git
13:50 endiruna joined #git
13:54 pR0Ps joined #git
13:54 jeffreylevesque joined #git
13:59 endiruna joined #git
13:59 theoceaniscool joined #git
13:59 mischat joined #git
14:00 dviola joined #git
14:08 manuelschneid3r joined #git
14:08 manuelschneid3r joined #git
14:10 Balliad joined #git
14:11 Orphis joined #git
14:13 NullableTruth joined #git
14:14 rorro joined #git
14:15 courrier joined #git
14:16 bernardio joined #git
14:18 Derperperd joined #git
14:19 manuelschneid3r joined #git
14:19 treia joined #git
14:21 mikecmpbll joined #git
14:27 hvxgr joined #git
14:31 djb-irc joined #git
14:31 Balliad joined #git
14:32 netj joined #git
14:33 hvxgr joined #git
14:34 krillr joined #git
14:35 pR0Ps joined #git
14:35 dave0x6d joined #git
14:35 hvxgr joined #git
14:36 zerorax joined #git
14:37 ecuanaso joined #git
14:38 ocbtec joined #git
14:41 balu_23 joined #git
14:43 User458764 joined #git
14:44 vuoto joined #git
14:44 User458764 joined #git
14:45 freimatz joined #git
14:49 Cabanossi joined #git
14:51 lindenle joined #git
14:52 hvxgr joined #git
14:52 djb-irc joined #git
14:53 robotroll joined #git
14:53 hvxgr joined #git
14:54 spacelord_ joined #git
14:56 hvxgr joined #git
14:59 User458764 joined #git
15:01 mischat joined #git
15:02 bernardio joined #git
15:04 solenodic joined #git
15:11 marlinc joined #git
15:11 jagob joined #git
15:12 ocbtec_ joined #git
15:12 pks joined #git
15:13 balu_23 joined #git
15:14 albel727 joined #git
15:14 mda1_ joined #git
15:15 mda1 joined #git
15:17 ocbtec joined #git
15:23 mehola joined #git
15:24 solenodic joined #git
15:24 hhee joined #git
15:25 harry2 joined #git
15:26 madewokherd joined #git
15:26 spacelord_ joined #git
15:27 rivarun joined #git
15:30 cyphase joined #git
15:31 ianmethyst joined #git
15:33 beuker joined #git
15:33 User458764 joined #git
15:35 cdown joined #git
15:36 mibr0 joined #git
15:42 ocbtec joined #git
15:46 rivarun joined #git
15:52 nowhereman joined #git
15:52 Murii joined #git
15:54 hvxgr joined #git
15:59 mischat joined #git
16:02 hvxgr joined #git
16:03 canuk joined #git
16:03 TheWild joined #git
16:06 rivarun joined #git
16:07 TheWild left #git
16:14 dsdeiz joined #git
16:14 dsdeiz joined #git
16:15 heftig joined #git
16:15 MineCoins joined #git
16:20 ywxxon joined #git
16:24 a_thakur joined #git
16:26 diogenese joined #git
16:33 overlord_tm joined #git
16:35 WaReZ joined #git
16:36 shgysk8zer0_ joined #git
16:38 miczac joined #git
16:38 xall_ joined #git
16:41 Derperperd joined #git
16:43 pur3eval joined #git
16:43 ResidentBiscuit joined #git
16:44 kesslerfrost joined #git
16:45 kesslerfrost left #git
16:45 [ADN] joined #git
16:48 Noldorin joined #git
16:50 solenodic joined #git
16:50 iamthad joined #git
16:53 Gsham joined #git
16:53 xall_ joined #git
16:55 Domhack joined #git
16:55 jnavila_ joined #git
16:56 spacelord_ joined #git
16:56 navidr joined #git
16:57 JanC_ joined #git
16:59 bernardio joined #git
17:01 xall joined #git
17:01 goob joined #git
17:01 jagobdue joined #git
17:05 pR0Ps joined #git
17:07 rgrinberg joined #git
17:07 finalbeta joined #git
17:09 rajkumar joined #git
17:10 wilbert joined #git
17:12 rgrinberg joined #git
17:14 harry2 joined #git
17:19 menip joined #git
17:21 Bizkit joined #git
17:23 Gsham joined #git
17:25 cdown joined #git
17:31 hiroki joined #git
17:31 hiroki joined #git
17:32 XenophonF joined #git
17:35 Gsham joined #git
17:37 a_thakur joined #git
17:37 publio joined #git
17:42 rivarun joined #git
17:42 Derperperd joined #git
17:42 leah2 joined #git
17:45 Gsham joined #git
17:50 ResidentBiscuit joined #git
17:50 Darcidride joined #git
17:52 courrier joined #git
17:54 repozitor joined #git
17:54 MineCoins joined #git
17:55 repozitor i have setup successfully git on my server
17:55 repozitor but i don't know how to force access control on my repository?
17:55 repozitor i mean user/pass on data fetch/get
17:55 repozitor git clone git://repozitor.com/project-1.git
17:55 repozitor run this command to get freely content.
17:56 repozitor i need to enforce authentication for users.
17:56 repozitor is there anybody know how to do it?
17:56 repozitor just get me a proper url, or …
17:57 spacelord_ joined #git
17:57 DolpheenDream joined #git
17:58 _ikke_ git:// protocol is unauthenticated
17:58 grawity repozitor: set up Gitolite (or Gogs, or Gitlab...)
17:58 grawity repozitor: then disable git:// and use ssh or https
17:59 repozitor why ssh or https?
17:59 grawity because they're the ones which support authentication
17:59 repozitor i think git protocol is designed for such these things
17:59 repozitor so i have to use it rather than ssh , ...
17:59 grawity (and authentication is required for access control)
17:59 a0x10c joined #git
18:00 grawity and I think git protocol is not designed for such these things
18:00 grawity so you have to use ssh or https instead
18:00 grawity really, Git speaks the same protocol over SSH *anyway*
18:00 repozitor so git can't evaluate users username/password
18:00 repozitor right?
18:00 grawity it cannot
18:00 grawity it relies on the sshd or the httpd for that
18:00 Derperperd joined #git
18:01 repozitor grawity, that's ridiculous
18:01 grawity https://i.imgur.com/WG1Pdf7.jpg
18:01 _ikke_ git:// is built for public access
18:01 _ikke_ read-only
18:01 _ikke_ not for private authenticated
18:02 _ikke_ repozitor: Note that just because it is called git:// it means it's better suited for transfering git data
18:02 repozitor _ikke_, you are right, i miss this point
18:03 _ikke_ ssh and smart http(s) use the same protocol
18:03 _ikke_ it just uses ssh or http for transport
18:03 repozitor _ikke_, transport and authentication, right?
18:03 _ikke_ right, that comes as part of the transport
18:04 cagmz joined #git
18:05 _ikke_ note that http(s) can be unauthenticated
18:05 _ikke_ (and you can even coerce ssh to go unauthenticated
18:05 _ikke_ )
18:05 _ikke_ perhaps
18:05 grawity as for being designed for such things,.
18:05 grawity "smart" transports (either git://, or SSH, or HTTP(S) with git-http-backend) speak the native Git protocol
18:06 grawity so they're all equally fast
18:06 Bizkit joined #git
18:06 grawity as opposed to "dumb" transports (ftp, rsync, or HTTP(S) *without* git-http-backend)
18:07 xenvre joined #git
18:08 digidog joined #git
18:10 repozitor grawity, but i don't like to grant ssh login access to my users.
18:10 repozitor they can hurt my server. :)
18:10 grawity you mean shell/sftp access?
18:10 repozitor i mean ssh access.
18:10 grawity they can't do anything with ssh
18:11 grawity unless you allow them to run commands through it
18:11 grawity and that's what Gitolite is for
18:11 raynold joined #git
18:11 repozitor so any idea to prevent command exec?
18:11 grawity did I mention you could use Gitolite for that
18:12 repozitor got it, so i need to setup gitolite.
18:12 anuxivm joined #git
18:12 grawity yes, or one of the similar projects
18:13 repozitor i know it, thanks buddy
18:14 repozitor grawity, do you know any beautiful and proffesional web-based gui for git exploring?
18:14 repozitor probably compatible with gitolite!
18:14 dreiss joined #git
18:15 repozitor something like github.com
18:15 repozitor i think it
18:15 repozitor it's perfect
18:15 grawity Gogs? Gitlab?
18:15 grawity if you want "professional", that usually comes with a price tag
18:16 repozitor grawity, of course free project.
18:16 repozitor for your information i want to setup it on my host.
18:16 spacelord_ joined #git
18:16 grawity then either Gogs or Gitlab
18:17 xenvre joined #git
18:18 _ikke_ gitlab used to use gitolite, but they since switched to their own authorization layer
18:18 repozitor grawity, i mean something like this one
18:18 repozitor https://gitphp.org
18:20 rebrec joined #git
18:21 duderonomy joined #git
18:21 mischat joined #git
18:24 borkr joined #git
18:25 disappointment joined #git
18:25 repozitor what is wrong with me?
18:25 repozitor i can clone with git, but not with ssh
18:25 repozitor http://paste.ubuntu.com/23935502/
18:25 repozitor here is the log ^_^
18:25 grawity which directory is the repository in?
18:26 repozitor home/MyUsername/git/project-1.git
18:26 grawity so put that in the `git clone ssh://...` command
18:26 grawity plain git+ssh doesn't automagically prefix the given path with anything
18:26 grawity if you need that, use Gitolite or such
18:27 YuGiOhJCJ joined #git
18:28 nostrora joined #git
18:28 repozitor grawity, why do i need to use ` ` ?
18:28 grawity you don't
18:28 repozitor and i don't know how!
18:29 disappointment Hi, can anyone tell me how to setup my server to have custom authentication in Git? What I'm trying to do is to use custom shell (which resides in /usr/bin/custom-git-shell) written in Go (like gitlab) for my `git` user to have custom authentication using SSH protocol.
18:29 re1 joined #git
18:29 grawity http://lmgtfy.com/?q=how+to+install+gitolite
18:29 _ikke_ disappointment: Set the shell for the git user to that shell
18:29 grawity disappointment: you can't change ssh's authentication that way
18:29 _ADN_ joined #git
18:29 _ikke_ for example with chsh
18:29 repozitor grawity, lmgf… is so funny
18:29 repozitor thanks
18:29 grawity disappointment: you can only change the *authorization*
18:30 repozitor sorry for disappointing you
18:30 _ikke_ right, authentication already happens before the shell is invoked
18:30 grawity disappointment: e.g. gitolite still generates the authorized_keys files but marks each one with what user it belongs to
18:30 disappointment @_ikke_: I suppose I'm missing something - for example tools like gitlab or gitorious do not ever actually change the shell using chsh.
18:30 grawity they give sshd a 'forced command' to always run
18:31 _ADN_ joined #git
18:31 grawity it still goes through sh -c "...", but users have no way of sending their own command
18:32 grawity that's why you have to disable password logins for Gitolite
18:33 disappointment @grawity: That's interesting - so these tools just hook into `sshd` with their own "forced commands"?
18:33 pur3eval joined #git
18:33 re1 joined #git
18:33 _ikke_ disappointment: .authorized_keys allows you to specify a forced command
18:33 _ikke_ .ssh/authorized_keys*
18:33 grawity disappointment: yes
18:33 grawity http://gitolite.com/gitolite/glssh.html even has examples
18:34 disappointment Very interesting - in that case I'm going to look into gitolite, thanks @grawity and @_ikke_.
18:34 _ikke_ Not a bad decission
18:35 grawity of course, dedicated hosting sites like GitHub or BitBucket actually modify the sshd itself (sometimes even write one from scratch)
18:38 gugah joined #git
18:41 disappointment OH, now I finally understand - thanks a lot - I've spent hours trying to figure out how auth really works inside these tools.
18:42 PioneerAxon joined #git
18:43 LeBlaaanc joined #git
18:44 bernardio joined #git
18:48 sexa joined #git
18:50 spacelord_ joined #git
18:52 grayjoc joined #git
18:53 oemb1905 joined #git
18:53 oemb1905 joined #git
18:54 lindenle joined #git
18:55 rgrinberg joined #git
18:55 bernardio joined #git
18:55 anuxivm joined #git
18:57 kasual joined #git
19:01 fatalhalt joined #git
19:02 Gsham joined #git
19:03 fiter joined #git
19:03 harry2 joined #git
19:04 cvn57l1sddk42ljq joined #git
19:05 grayjoc joined #git
19:05 eb0t joined #git
19:06 albel727 joined #git
19:12 nckpz joined #git
19:13 bluepixel joined #git
19:15 matoro joined #git
19:17 grayjoc joined #git
19:18 mischat joined #git
19:20 MineCoins joined #git
19:22 Gsham joined #git
19:23 thierryp joined #git
19:24 jozwior joined #git
19:24 mehola joined #git
19:25 khisanth_ joined #git
19:28 pur3eval joined #git
19:30 shinnya joined #git
19:31 JamesBaxter joined #git
19:38 flavius joined #git
19:39 MineCoins joined #git
19:41 cdown joined #git
19:43 repozitor joined #git
19:44 theoceaniscool joined #git
19:46 Gsham joined #git
19:48 altendky left #git
19:49 anuxivm joined #git
19:49 robotroll joined #git
19:49 MineCoins joined #git
19:53 solenodic joined #git
19:53 Aleric I'm teaching minors programming, and we're using git...
19:53 anuxivm left #git
19:54 matoro joined #git
19:54 Aleric I feel I'm endangering my job by having to tell them stuff like "There might be collisions now so you probably want to do 'git reset --hard HEAD' before the pull".
19:55 _ikke_ right, that's not a very good advise
19:56 peepsalot joined #git
19:57 Aleric I guess I'm the only one with a dirty mind then :p.  And it is a good advise, I know exactly what changes are their working tree and I fixed it (differently) upstream in the repo.
19:58 Darcidride joined #git
20:00 ResidentBiscuit joined #git
20:02 Darcidride joined #git
20:04 anuxivm joined #git
20:04 raijin joined #git
20:06 cdown joined #git
20:06 MineCoins joined #git
20:06 rivarun joined #git
20:08 dhollinger joined #git
20:10 Dyqo joined #git
20:11 canuk joined #git
20:11 dviola joined #git
20:16 endiruna joined #git
20:17 pur3eval joined #git
20:18 aidalgol joined #git
20:19 tmk joined #git
20:26 overlord_tm joined #git
20:27 Atm0spher1c joined #git
20:27 bernardio joined #git
20:29 dreiss joined #git
20:31 kadoban joined #git
20:32 solenodic joined #git
20:33 dviola joined #git
20:34 MineCoins joined #git
20:40 a3Dman joined #git
20:41 MattMaker joined #git
20:44 mrkake joined #git
20:45 ianmethyst joined #git
20:47 cdown joined #git
20:48 MineCoins joined #git
20:48 ExeciN joined #git
20:49 warthog9 joined #git
20:50 adymitruk hey everyone, can you vote / comment? https://news.ycombinator.com/item?id=13574549
20:50 astrofog joined #git
20:50 F0sea joined #git
20:51 asd5a joined #git
20:52 harry2 joined #git
20:53 _28_ria joined #git
20:55 rewt that whole section on back-merges is based on an apparent misinterpretation of a quote (and the term seems to be used backwards)
20:55 __builtin joined #git
20:55 xlegoman joined #git
20:58 warthog9 joined #git
20:58 __builtin left #git
20:59 gugah joined #git
21:04 mrkake joined #git
21:05 Rhonda joined #git
21:06 xaviergmail_ joined #git
21:06 Hudu joined #git
21:08 adymitruk rewt: what do you mean backwards?
21:09 adymitruk I always believed that merging things from branches that have a lot of work from other branches will make the current branch hard to rebase and otherwise less movable
21:09 rewt a back-merge is when a feature branch is merged back to master branch, but it seems to be used as "merge master to feature"
21:09 solenodic joined #git
21:10 rewt you shouldn't be rebasing any pushed commits anyways
21:10 adymitruk yes. that's what torvalds initially didn't want and called it a back-merge in the mailing list
21:10 adymitruk rewt: if it's your own branch, you can
21:10 rewt if it's public, you shouldn't
21:11 rewt he even said that in the post you quoted from
21:11 adymitruk yes
21:12 adymitruk I generally don't do any rebasing at all. The focus is on being able to reset bad merges and reconstruct what is needed by just merging appropriate branches
21:12 netj joined #git
21:16 rewt yea, looks like he's calling feature-to-master a back-merge; opposite of how you use it
21:16 adymitruk rewt: I recall it being used in other emails from him. I'll clear it up in the article. Thanks for spotting that.
21:17 cosepinyari joined #git
21:19 | joined #git
21:19 adymitruk rewt: https://lkml.org/lkml/2014/10/12/100
21:20 adymitruk this is the interpretation that I use. The back-merge is taking upstream changes in the middle of their work. So I have it the right way around.
21:20 adymitruk I don't want a merge in the history of my feature branch
21:21 adymitruk I can merge *it* into higher order branches or experimental branches if I want (and I should be doing the latter via an integration branch)
21:21 adymitruk the back-merges should only be done as exceptional events
21:21 rewt i found this where he's talking about merging dri feature into kernel -- http://www.mail-archive.com/dri-devel​@lists.sourceforge.net/msg13012.html
21:22 adymitruk that may be an exceptional case. The email I linked to is his rule for all work.
21:23 rewt and this where he's also talking about merging back to kernel -- https://lkml.org/lkml/2011/3/10/572
21:23 Darcidride joined #git
21:23 adymitruk merging back to kernel is not a back merge
21:23 rewt and that's the general usage elsewhere too
21:24 adymitruk a back-merge is something opposite of the direction in which you merge
21:24 adymitruk it is always checkout the more important branch and merge the less important branch
21:25 _ikke_ I would use base and derrived instead of importance
21:25 _ikke_ Or something like that
21:25 adymitruk if he is loosely using the words "merge that back into master", it means it's still a regular merge
21:25 adymitruk _ikke_: sure, I could improve my choice of words.
21:26 adymitruk most people can see quicker what is more important. If by convention you have master as something that is to be a solid place to start any new work off of, it is more important
21:27 navidr joined #git
21:27 Gsham joined #git
21:29 _ikke_ adymitruk: note that in that same e-mail, he does mention reasons why one want to do a back-merge, but that it then should be very explictly mentioned in the merge message
21:30 _ikke_ "I think all merges should have
21:30 adymitruk yes. it's definitely something that you can use, but generally should be avoided as the history now has some implications of what you can do with it.
21:30 _ikke_ descriptive commit messages, the same way regular code changes should
21:30 _ikke_ That's the reason git merge now always requires a message to be passed
21:30 |ifei5g00d joined #git
21:31 adymitruk yes, I remember when that was introduced. It used to automatically commit if there were no conflicts.
21:31 manuelschneid3r joined #git
21:34 mehola joined #git
21:42 johnny56_ joined #git
21:44 Gsham joined #git
21:44 aidalgol joined #git
21:47 tang^ joined #git
21:54 DINOWILLIAM joined #git
22:04 DINOWILLIAM left #git
22:04 zezba joined #git
22:09 Nightwing52 joined #git
22:11 a3Dman joined #git
22:16 ertes joined #git
22:21 ISmithers joined #git
22:21 Nightwing52 left #git
22:26 Bizkit joined #git
22:31 Ryanar joined #git
22:32 NeverDie joined #git
22:32 anuxivm joined #git
22:33 sucks joined #git
22:34 sucks joined #git
22:34 ShalokShalom joined #git
22:37 sucks left #git
22:38 Gsham joined #git
22:38 lektrik joined #git
22:41 harry2 joined #git
22:41 timwis joined #git
22:42 evanc joined #git
22:42 ariver joined #git
22:42 sucks joined #git
22:43 jbitdrop joined #git
22:43 addshore joined #git
22:44 jbitdrop joined #git
22:44 Lowell joined #git
22:44 kireevco joined #git
22:46 [diecast] joined #git
22:47 DuncanT joined #git
22:47 cdown joined #git
22:48 zezba joined #git
22:49 jbitdrop joined #git
22:49 lindenle joined #git
22:49 nowhereman joined #git
22:50 sucks joined #git
22:51 Ryanar joined #git
22:53 thierryp joined #git
22:54 dhollinger joined #git
22:54 ExeciN joined #git
22:55 ianmethyst joined #git
23:01 ShalokShalom joined #git
23:01 fmeerkoetter joined #git
23:01 a3Dman joined #git
23:04 jbitdrop joined #git
23:05 zezba left #git
23:08 ToBeCloud joined #git
23:08 matoro joined #git
23:13 JanC joined #git
23:13 xlegoman joined #git
23:17 lindenle joined #git
23:18 rangergord joined #git
23:23 rangergord Hi. Is there a way for a repo owner to force a git hook to be applied on any checkout, without writing server-side hooks that reject pushes, without dealing with PRs, and without the user doing manual steps? A common situation is for a new person to check out, forget to attach the pre-commit hook that lints befroe commit (even though big warnings appear when the app starts). There's various
23:23 rangergord solutions, like to yell loudly, or write server-side hooks, or any other number of things. But I'm asking if there's something I can do to my repo, so that when another person checks it out, when they call "git push", it somehow does "lint && git push".
23:24 rangergord there doesn't seem to be a way to have project-specific gitconfig that has a custom git alias
23:26 raijin joined #git
23:26 anuxivm left #git
23:27 nedbat rangergord: i'm not sure there's a way to do that. perhaps a check in your test suite that git is configured as you want?
23:27 msonntag joined #git
23:28 a3Dman joined #git
23:29 rangergord Don't have an automatic test suite. Currently I have the launch script display a warning in caps and lots of exclamation points, then sleep for 5 seconds to make sure it's been read. It still happens.
23:29 anuxivm joined #git
23:29 rangergord If the changes are not being tested (eg JSON config modifications) it would pass the tests anyway
23:30 rangergord I guess there's no way then. Thanks.
23:32 sammyo joined #git
23:32 nedbat rangergord: yeah, git can't solve all the social problems within teams :)
23:33 anuxivm left #git
23:33 rangergord it isn't unreasonable to want git to let you create a project-specific gitconfig though. Just like .git/config overrides ~/.gitconfig, you could make local > project > home
23:34 rangergord .git/config overrides ./gitconfig which overrides ~/.gitconfig
23:35 anuxivm joined #git
23:36 Kaisyu joined #git
23:37 Ryanar joined #git
23:39 _xor joined #git
23:41 ExeciN joined #git
23:46 spacelord_ joined #git
23:47 strugee joined #git
23:49 endiruna joined #git
23:49 fletom joined #git
23:58 mrkake joined #git
23:59 anuxivm left #git

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