Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-07-09

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

All times shown according to UTC.

Time Nick Message
00:01 Chiko joined #git
00:02 acetakwas joined #git
00:06 ffabi joined #git
00:08 johnnyfive joined #git
00:10 foo left #git
00:10 romerocesar joined #git
00:12 johnny56 joined #git
00:13 ffabi joined #git
00:13 EvilPeng1 joined #git
00:19 efdetonator joined #git
00:22 fstd_ joined #git
00:22 Bombe joined #git
00:23 stantonk joined #git
00:25 A5101 joined #git
00:25 Literphor joined #git
00:26 acetakwas joined #git
00:34 fishcooker joined #git
00:39 romerocesar_ joined #git
00:41 texinwien_ joined #git
00:45 malide joined #git
00:45 fracting joined #git
00:45 Ravana joined #git
00:46 tmcmahon joined #git
00:46 fuchstronaut joined #git
00:51 fission6 joined #git
00:51 Rodya_ joined #git
00:52 rbern joined #git
00:55 durham_ joined #git
01:00 Rodya_ joined #git
01:01 jeffreylevesque joined #git
01:08 romerocesar joined #git
01:10 EvilPeng1 joined #git
01:13 azbarcea joined #git
01:18 benwbooth joined #git
01:19 romerocesar_ joined #git
01:20 Sasazuka joined #git
01:23 pks joined #git
01:23 ekinmur joined #git
01:28 EvilPeng1 joined #git
01:28 ac3takwas joined #git
01:29 romerocesar joined #git
01:33 SimonNa joined #git
01:33 m_ben left #git
01:34 Rodya_ joined #git
01:35 cdg joined #git
01:36 bouncy joined #git
01:39 romerocesar_ joined #git
01:40 sarbs joined #git
01:45 dangerousdave joined #git
01:45 jaguarmagenta joined #git
01:45 leeN joined #git
01:48 hahuang61 joined #git
01:49 romerocesar joined #git
01:51 Rodya_ joined #git
01:52 azbarcea joined #git
01:52 arescorpio joined #git
01:54 ekinmur joined #git
01:58 mkopriva joined #git
01:58 Goplat joined #git
02:00 Eugene joined #git
02:00 liuzhen joined #git
02:01 romerocesar_ joined #git
02:01 vbsales joined #git
02:05 jim_carry joined #git
02:11 romerocesar joined #git
02:13 Limes_ joined #git
02:15 jim_carry joined #git
02:16 fracting joined #git
02:21 jim_carry joined #git
02:23 ochorocho__ joined #git
02:25 Literphor joined #git
02:26 hexagoxel joined #git
02:26 PaulCapestany joined #git
02:27 pur3eval joined #git
02:30 armenzg joined #git
02:34 tcsc joined #git
02:38 catag87 joined #git
02:39 Geo joined #git
02:40 ac3takwas joined #git
02:40 catag87 joined #git
02:41 Geo joined #git
02:41 Geo Hi! one of our brilliant co-devs, several dozen commits back, somehow managed to only merge the 'ChangeLog' file in about a dozen PRs (via GitHub). I assume the local branches have since been deleted; is there someway to go back and resurrect these PRs to merge in the *entire* commit, not just the one file he merged?
02:42 zumba_ad_ joined #git
02:43 Faylite joined #git
02:44 chachasmooth joined #git
02:44 Bennux joined #git
02:45 scottbot84 joined #git
02:45 Literphor joined #git
02:46 shgysk8zer0_ joined #git
02:46 jcadduono left #git
02:47 fuchstronaut joined #git
02:48 shgysk8zer0_ joined #git
02:49 Sazhen86 joined #git
02:50 efdetonator joined #git
02:52 zumba_a__ joined #git
02:54 Bizkit joined #git
02:54 Bizkit joined #git
02:57 azbarcea joined #git
03:00 SwiftMatt joined #git
03:02 shgysk8zer0_ joined #git
03:04 kbs` joined #git
03:05 kbs` left #git
03:05 netj joined #git
03:05 kbs joined #git
03:07 Literphor joined #git
03:14 wiky joined #git
03:18 FuzzySockets joined #git
03:21 treaki__ joined #git
03:23 akushner joined #git
03:28 ashafar joined #git
03:29 mehola joined #git
03:34 jaguarmagenta joined #git
03:34 zrts joined #git
03:44 Literphor joined #git
03:47 mkopriva joined #git
03:48 romerocesar joined #git
03:48 hahuang61 joined #git
03:49 zumba_ad_ joined #git
03:52 inflames joined #git
03:52 cqi joined #git
03:54 Shentino joined #git
03:58 DarkoEyes joined #git
03:58 fracting joined #git
04:03 mehola joined #git
04:09 watabou joined #git
04:10 xcesariox joined #git
04:11 jungsubk joined #git
04:11 tyreld joined #git
04:14 dsantiago joined #git
04:15 skirk joined #git
04:18 a_thakur joined #git
04:19 a_thakur joined #git
04:21 azbarcea joined #git
04:21 jaguarmagenta joined #git
04:24 jstimm joined #git
04:25 ochorocho__ joined #git
04:29 semantipc joined #git
04:29 ojacobson Geo: Github keeps refs for all pull requests, even closed ones, so that's one opion
04:29 ojacobson another would be to look at !lol and find the merged branches, then work from there
04:29 gitinfo A nifty view of branches, tags, and other refs: git log --oneline --graph --decorate --all
04:32 Literphor joined #git
04:34 romerocesar joined #git
04:35 lindenle joined #git
04:36 kellytk Please pardon the GitUp question, do you know why its quickview of tracked files omits the trailing empty newlines?
04:37 kellytk Nevermind I double-checked and the weak editor I'm using pretends there's a blank line at the end of the file
04:38 fracting joined #git
04:39 wrouesnel joined #git
04:39 OnBrokenWings joined #git
04:41 mkopriva joined #git
04:44 fscala joined #git
04:47 Cabanossi joined #git
04:48 SwiftMatt joined #git
04:48 fuchstronaut joined #git
04:48 ShapeShifter499 joined #git
04:50 ome joined #git
04:50 harish_ joined #git
04:55 romerocesar joined #git
04:55 nilg joined #git
04:55 JanC_ joined #git
04:57 Coldseeker joined #git
04:59 semantipc joined #git
05:05 subhojit777 joined #git
05:08 SwiftMatt joined #git
05:08 kellytk join #programming
05:10 hk238 joined #git
05:11 steveballmer joined #git
05:13 Geo thanks ojacobson
05:13 Geo how would I locate those refs?
05:13 ojacobson git ls-remote
05:14 ojacobson (they're refs/pull/NNNN/head and refs/pull/NNNN/merge :)
05:14 Geo awesome
05:14 Geo thank you very much
05:17 moriko joined #git
05:18 romerocesar joined #git
05:19 semantipc joined #git
05:21 Coldseeker do i have to specifically pull a remote branch? 'git branch' is only listing 'master'
05:29 kellytk left #git
05:29 jaggz joined #git
05:29 ojacobson Coldseeker: every repo has its own set of branches.
05:30 ojacobson Your 'master' is independent of (though related to) the original repo's 'master'
05:30 ojacobson so it goes: `git branch -r` will show cached copies of other repos' branches, and you can create local branches from those
05:34 alt513 joined #git
05:34 catag87 joined #git
05:36 Rodya_ joined #git
05:37 A5101 joined #git
05:38 fishcooker joined #git
05:38 Literphor joined #git
05:38 vuoto joined #git
05:39 romerocesar joined #git
05:41 mkoskar joined #git
05:44 Rodya_ joined #git
05:48 tvw joined #git
05:49 hahuang61 joined #git
05:50 freimatz joined #git
05:55 dreiss joined #git
05:58 freimatz joined #git
06:02 dsdeiz joined #git
06:03 romerocesar_ joined #git
06:03 xcesariox joined #git
06:04 Geo left #git
06:05 stantonk joined #git
06:07 Literphor joined #git
06:11 devbug joined #git
06:13 romerocesar joined #git
06:14 shgysk8zer0_ joined #git
06:15 rainbyte joined #git
06:17 semantip_ joined #git
06:18 circ-user-s5NbU joined #git
06:18 acetakwas joined #git
06:21 TomyLobo joined #git
06:25 romerocesar joined #git
06:26 ochorocho__ joined #git
06:28 ajf- joined #git
06:31 Codfection joined #git
06:37 lindenle joined #git
06:38 zumba_ad_ joined #git
06:39 b1tchcakes joined #git
06:40 cs02rm0 joined #git
06:43 semantipc joined #git
06:49 romerocesar_ joined #git
06:49 fuchstronaut joined #git
06:50 eijk_ joined #git
06:52 cqi joined #git
06:52 dreiss joined #git
06:52 cqi joined #git
06:53 The_Phoenix1 joined #git
06:55 nnyk joined #git
06:56 shgysk8zer0_ joined #git
06:57 romerocesar joined #git
06:57 Literphor joined #git
06:57 a_thakur joined #git
06:57 cs02rm0 joined #git
06:57 cyan__ joined #git
06:57 m__ joined #git
07:01 hck89 joined #git
07:02 hck89 joined #git
07:03 cdown joined #git
07:04 t0by joined #git
07:08 circ-user-s5NbU joined #git
07:09 aidalgol joined #git
07:09 Jackneill joined #git
07:11 Codfection joined #git
07:11 Literphor joined #git
07:12 Codfection joined #git
07:12 romerocesar_ joined #git
07:17 circ-user-fEAcm joined #git
07:19 romerocesar joined #git
07:22 zumba_addict joined #git
07:23 stuh84 joined #git
07:23 mkopriva joined #git
07:28 t0by joined #git
07:29 alkino joined #git
07:29 romerocesar joined #git
07:34 texinwien_ joined #git
07:34 PCatinean joined #git
07:34 Literphor joined #git
07:36 catag87 joined #git
07:40 rainbyte joined #git
07:41 psaifi joined #git
07:49 multi_io joined #git
07:50 hahuang61 joined #git
07:51 ajf- joined #git
07:59 toogley joined #git
08:03 manosnore joined #git
08:03 minn joined #git
08:04 tristanp joined #git
08:06 devbug joined #git
08:07 dopesong joined #git
08:08 ynanm joined #git
08:09 cs02rm0 joined #git
08:12 elastix joined #git
08:17 zytrix joined #git
08:18 texinwien_ joined #git
08:21 nwkj86 joined #git
08:23 nnyk_ joined #git
08:23 ochorocho__ joined #git
08:24 subhojit777 joined #git
08:25 sanketdg joined #git
08:26 romerocesar_ joined #git
08:26 lordjancso joined #git
08:29 romerocesar joined #git
08:31 SimonNa joined #git
08:37 romerocesar joined #git
08:40 romerocesar_ joined #git
08:40 SteffanW joined #git
08:42 sanketdg joined #git
08:43 FuzzySockets joined #git
08:44 FuzzySockets joined #git
08:49 davisonio joined #git
08:50 fuchstronaut joined #git
08:51 quetz joined #git
08:53 SimonNaa joined #git
08:56 keltvek joined #git
08:57 stantonk joined #git
09:00 a_thakur joined #git
09:05 tristanp joined #git
09:08 acetakwas joined #git
09:10 King_Hual joined #git
09:11 hck89 joined #git
09:12 zeemz joined #git
09:13 cdown joined #git
09:13 armyriad joined #git
09:13 FunkyAss joined #git
09:15 mase-tech joined #git
09:15 fnky joined #git
09:18 settermjd joined #git
09:19 netcarver joined #git
09:20 chris62 joined #git
09:23 chris262 joined #git
09:25 chris262 left #git
09:32 ToBeCloud joined #git
09:34 Codfection joined #git
09:35 average joined #git
09:35 average if I delete a github fork after a pull-request is created, and just leave the pull-request open, will the upstream still be able to merge the pull-request ?
09:36 catag87 joined #git
09:38 catsup joined #git
09:39 romerocesar joined #git
09:44 Mikaela yes, if I recall correctly it just shows as "from unknown reposiotiry / unknown branch" and the only issue is that you cannot edit the pull request
09:48 catsup joined #git
09:51 hahuang61 joined #git
09:53 zeroed joined #git
09:55 dsdeiz joined #git
09:55 dsdeiz joined #git
09:59 fishcooker joined #git
10:00 romerocesar joined #git
10:02 david007 joined #git
10:06 tristanp joined #git
10:10 cdown_ joined #git
10:17 lordjancso joined #git
10:19 SteffanW2 joined #git
10:19 fission6 joined #git
10:21 quetz^^ joined #git
10:21 davisonio joined #git
10:22 sdothum joined #git
10:23 maroloccio joined #git
10:24 ochorocho__ joined #git
10:25 dopesong joined #git
10:25 maroloccio what is the _correct_ terminology to refer to /a/b where the git "control dir" is in /a/b/.git? which exact path is the git "repository"? is /a/b/.git the "control dir" or is that an invalid term i picked up from using dulwich? (a python lib with git functionality). is somebody asks for a git repo dir.. what do you *expect* to supply? /a/b or /a/b/.git or even /a/b.git (and why ever use the latter?!?)
10:26 ahmedelgabri joined #git
10:27 quetz joined #git
10:27 _ikke_ a/b.git usually refers (by convention) to bare repositories
10:28 _ikke_ Referring to /a/b/ should in most cases be enough
10:28 _ikke_ The rest can be inferred
10:28 maroloccio _ikke_: wait, please
10:29 maroloccio _ikke_: if i write /a/b.git in actual fact... there is neither an actual dir anywhere under /a/b.git or /a/b/.git correct?
10:29 _ikke_ maroloccio: depends what you mean with an actual dir
10:30 maroloccio mkdir /actual/dir, allows me to ls -d /actual/dir
10:30 _ikke_ a/b.git would (in case of a bare repository) contain the same files and dirs found it a .git dir
10:30 romerocesar joined #git
10:30 maroloccio _ikke_: but on the filesystem, there would be no such dir. nothing named b<dot><g><i><t>
10:31 _ikke_ it case of a bare repository, there would
10:31 maroloccio to me, it is clear that a bare repo has the .git dir at the root level, not needing room for a working dir at the root
10:32 mkopriva joined #git
10:32 maroloccio well cd tmp; git init --bare a does not create /tmp/a.git, it creates /tmp/a correct?
10:32 maroloccio if i did git init a, then i'd have /tmp/a/.git
10:32 _ikke_ yes, that's why I say that the convention is to call them a.git
10:33 maroloccio that's nutty
10:33 _ikke_ It's a convention
10:33 _ikke_ Nothing that requires you to call them that way
10:34 maroloccio _ikke_: so if i wanted to refer to a bare git repo at filesystem path /tmp/a, i would use this non-existing path instead? /tmp/a.git?
10:34 _ikke_ You see it back in github clone rls
10:34 _ikke_ maroloccio: no
10:34 maroloccio no?
10:34 maroloccio then i dont understand anything
10:35 _ikke_ Though git tries /tmp/a when you try to clone a.git, it's better to either call it a.git, and clone with a.git, or call it 'a', and clone it with 'a'
10:37 mischat joined #git
10:37 fuchstronaut joined #git
10:38 maroloccio _ikke_: yes it's a nuts convention which does not make anything self-evident and does not save time. only raises questions and behaves non-intuitively
10:39 maroloccio inconsistent shit. i git clone a.git and, depending on whether there is a a/.git "control" dir or not it does X or Y.
10:40 maroloccio _ikke_: thanks a lot for the explanation anyway. i appreciate it
10:40 _ikke_ It's quite consistent
10:40 lindenle joined #git
10:40 _ikke_ There is a convention, and git usues a fallback
10:40 _ikke_ nothing more
10:42 maroloccio _ikke_: what does it add, really
10:42 maroloccio _ikke_: it is likely i am missing the point
10:43 maroloccio i dont want to content that is does not add anything, i want to learn about a case in which it adds something that i cant imagine yet because i am short-sighted
10:43 osse having .git at the end of the path is an indication to humans that what's inside is a bare repo. nothing more, nothing less.
10:44 GavinMagnus joined #git
10:45 maroloccio cd /tmo; git init a.git -> Initialized empty Git repository in /tmp/a.git/.git/
10:46 osse in that case you told git what the directory name should be, so it just does your bidding
10:46 grawity as mentioned above, it's just an indication to humans; calling it something.git won't automatically --bare
10:46 osse one could argue that since the name has .git in it, at --bare is missing it should print a warning or something. oh well
10:47 _ikke_ Git does not care
10:47 _ikke_ Nore should it
10:48 _ikke_ The only convention is that bare repository directories end with .git, but this is not a requirement
10:48 maroloccio a non enforced indication, to me, is not even an indication. ok... a "hint". a useful "hint"? i dont know
10:50 osse it's the same kind of "hint" as python files endiing in .py, and directories in /etc endinding in .d, and configuration files ending in .conf even though it could just as well been .txt and so on and so on and so on
10:50 maroloccio it makes more assumptions that it clarifies doubts. it introduces the assumption that nobody would ever call his git repo "myrepo.git". why would one _never_ do that, invalidating the "convention"? well.. no reason really
10:50 maroloccio osse: you know thats not the same thing
10:50 _ikke_ It is
10:50 romerocesar joined #git
10:51 _ikke_ The only thing enforced is that for non-bare repositories, it should have a dir or file called .git
10:51 maroloccio no because if i say f.py you expect to find a file there. it may not contain python code.. but there would be something there. a dir? possible. a jpeg? possible. but something is there or "invalid path"
10:52 maroloccio somepath.git is actually referring to something that does exist, so it's different
10:52 osse when does it ever refer to something that doesn't exist?
10:52 maroloccio and it may well exist, which adds to the confusion
10:52 maroloccio osse: when you give me a.git and in reality the path is a and the .git only tell me it's a --bare
10:52 _ikke_ git will try /foo if /foo.git does not exist
10:52 osse maroloccio: and when does that ever happen?
10:53 ajf- joined #git
10:53 maroloccio there is no actual filesystem path at a.git. you gave me a non-existing path. it's not the same as giving me f.py
10:53 _ikke_ That's just a fallback
10:53 choki joined #git
10:53 _ikke_ But not encouraged
10:54 maroloccio git init b; git clone b.git
10:54 maroloccio does not fall back shit :)
10:54 _ikke_ Then it's not even a problem :-)
10:54 osse maroloccio: when have you been given a.git when it doesn't exist?
10:54 osse i'm confused by your confusion
10:54 maroloccio osse: i have!
10:54 _ikke_ Then you always refer to something that exists
10:54 _ikke_ I think the fallback is the other way around
10:55 osse maroloccio: I believe you, I just want an example
10:55 maroloccio this sentence is false: "git will try /foo if /foo.git does not exist" <- from _ikke_
10:55 maroloccio osse: a git front end program using dulwich, as i said at the beginning. a python program
10:56 Arban joined #git
10:56 maroloccio because _ikke_ is that were true.. git init b; git clone b.git would work
10:56 maroloccio but it does not.. because that is a piece of shit convention that not even the tool recognises
10:56 maroloccio :)
10:56 _ikke_ maroloccio: So what's your problem then
10:56 maroloccio the ambiguity
10:56 _ikke_ Then you have to always refer to a directory that exists
10:56 _ikke_ There is none
10:57 maroloccio yes, you tell me to clone a.git but, as you saw, that does not respect your convention
10:57 _ikke_ maroloccio: The convention is to *call* the bare directory a.git
10:58 _ikke_ and then clone it as a.git
10:58 _ikke_ Nothing more, nothing less
10:58 _ikke_ I never said, call you dir a and clone it as a.git
10:59 maroloccio git init --bare c; git clone c.git -> fatal: repository 'c.git' does not exist
10:59 _ikke_ git init --bare c.git ** git clone c.git
10:59 _ikke_ s/**/&&/
10:59 osse maroloccio: _ikke_ git it wrong; it works the other way around. end of story.
11:00 osse ''git init a.git; git clone a'' works. ''git init a; git clone a.git'' does not.
11:00 maroloccio yeah that works
11:01 romerocesar joined #git
11:01 maroloccio also this works: git init --bare d.git; git clone d
11:01 osse I don't appreciate that clone does that, but I guess it's because people thing URLs ending in .git aren't pretty.
11:01 settermjd joined #git
11:02 maroloccio i dont appreciate shit of this "convention" with corner cases which creates confusion
11:02 osse anyway, I will never tell you a.git if I mean a, so you don't have to worry about that
11:02 maroloccio but thanks you both for the chat
11:02 maroloccio osse: i never thought you would, actually
11:02 maroloccio osse: knowing you
11:03 osse and shame on the tool that subjected you to this
11:04 osse i can't think of examples right now, but I've seen it several times that tools expect you to give them the basename of the file, and it anoys me every time
11:04 maroloccio osse: :(
11:05 osse that git clone has this quirk is related to, but separate from this convention we're talking about.
11:07 tristanp joined #git
11:07 ramor joined #git
11:07 _ikke_ yes
11:08 _ikke_ You can either call it a quirk, or git trying to be nice
11:09 osse And it would make sense to me that git init prints some sort of "warning" when you call a non-bare repo foo.git or vice versa.
11:09 ruuj joined #git
11:09 osse but it would not make sense to me to forbid it
11:10 ruujone joined #git
11:14 xcesariox joined #git
11:15 bgamari joined #git
11:16 ojdo joined #git
11:20 netj_ joined #git
11:20 romerocesar joined #git
11:22 maroloccio warning -> totally
11:22 _ikke_ I don't see why it should warn on git init foo.bare
11:23 _ikke_ git init foo.git
11:24 osse because of everything we've just discussed
11:25 ahmedelgabri joined #git
11:25 cs02rm0 joined #git
11:26 fahadash joined #git
11:28 Darcidride joined #git
11:28 LarArT joined #git
11:36 fuchstronaut joined #git
11:37 catag87 joined #git
11:38 nolie joined #git
11:39 masterd joined #git
11:39 jost joined #git
11:39 _ikke_ Which is? I hardly see it as a problem
11:40 _ikke_ The only 'quirk' I see is when you clone foo and only foo.git exists, it will use that
11:41 mischat joined #git
11:43 tokage joined #git
11:43 osse _ikke_: the "warning" I envision is just more of an advice
11:43 a_thakur joined #git
11:44 osse it won't stop you; it'll just let you know what you're doing is uncommon
11:44 osse to help maintain the convention
11:44 masterd left #git
11:45 _ikke_ Is it that much of a problem that it's necessary?
11:46 robotroll joined #git
11:46 GavinMagnus left #git
11:46 osse not in my opinion
11:46 osse nor is the warning that you cloned an empty repo
11:46 osse it would be helpful for some, and harmless for the rest
11:47 _ikke_ I think cloning an empty repo is more common than calling a non-bare repository *.git
11:48 BlessJah /1/lp
11:48 osse _ikke_: agreed
11:48 osse but every time I've cloned an empty repo I already knew beforehand and it was definitely my intention
11:48 bumpy joined #git
11:49 jaggz joined #git
11:50 osse It's fine if you disagree. I just wanted to explain why, because it seemed you not merely disgreed, but didn't understand.
11:51 romerocesar joined #git
11:51 BombStrike joined #git
11:51 cs02rm0 joined #git
11:51 hahuang61 joined #git
11:52 davisonio joined #git
11:52 tokage joined #git
11:52 tvw joined #git
11:53 ToBeCloud joined #git
11:53 muthu joined #git
11:54 _ikke_ I failed to see the actual problem that people needed to be warned about
11:54 thierryp joined #git
11:54 _ikke_ It's not that we regularly seeing people run into this or something
11:55 osse you're exhagerrating it. or you think I am
11:56 osse I'm not saying it's a PROBLEM or that people NEED to be warned.
11:56 osse I am just saying it would be helpful
11:57 fuchstronaut joined #git
11:57 mkoskar joined #git
12:00 nilg joined #git
12:00 allcentury joined #git
12:00 zeroed joined #git
12:02 tomog999 joined #git
12:09 Discovery joined #git
12:12 IlNominePatre joined #git
12:13 aax joined #git
12:13 OnBrokenWings joined #git
12:14 thierryp joined #git
12:14 DieguezZ joined #git
12:14 inflames joined #git
12:16 davisonio joined #git
12:18 pioiytr joined #git
12:20 jaguarmagenta joined #git
12:21 treehug88 joined #git
12:22 hck89 joined #git
12:24 ochorocho__ joined #git
12:30 Noldorin joined #git
12:31 Oebele joined #git
12:37 mt joined #git
12:40 paws_ joined #git
12:42 mischat joined #git
12:42 DieguezZ joined #git
12:45 ag4ve joined #git
12:46 yqt joined #git
12:48 elsevero joined #git
12:50 rahtgaz joined #git
12:53 Uaoi5 joined #git
12:55 ag4ve_ joined #git
12:55 ahmedelgabri joined #git
12:57 fuchstronaut joined #git
12:59 ahmed_elgabri joined #git
13:00 pioiytr_ joined #git
13:01 ochorocho__ joined #git
13:01 nnyk_ joined #git
13:07 mdw joined #git
13:08 Bizkit joined #git
13:10 tristanp joined #git
13:10 fscala joined #git
13:12 johnmilton joined #git
13:13 mdw_ joined #git
13:14 jaguarmagenta joined #git
13:22 elastix joined #git
13:23 freimatz joined #git
13:26 lindenle joined #git
13:28 mdw joined #git
13:30 chitopunk joined #git
13:34 cqi joined #git
13:35 pi_0 joined #git
13:36 fuchstronaut joined #git
13:39 madewokherd joined #git
13:43 ramsub07 joined #git
13:43 mischat joined #git
13:46 Guest51884 joined #git
13:52 hahuang61 joined #git
13:53 narendraj9 joined #git
13:55 Guest25723 joined #git
13:57 hoangtranwork joined #git
13:58 sanketdg joined #git
14:02 Bizkit joined #git
14:02 sangy joined #git
14:04 fracting joined #git
14:06 LiohAu joined #git
14:09 muelli joined #git
14:11 hahuang61 joined #git
14:12 allcentury joined #git
14:13 sonOfRa joined #git
14:13 cs02rm0 joined #git
14:15 Samual joined #git
14:15 Samual joined #git
14:16 anuxivm joined #git
14:17 a3Dman joined #git
14:21 DieguezZ joined #git
14:22 Anil joined #git
14:23 franl joined #git
14:23 D-Boy joined #git
14:25 hoangtranwork joined #git
14:26 kbs joined #git
14:26 cdg joined #git
14:27 davisonio joined #git
14:29 Anil left #git
14:29 dopesong joined #git
14:29 ruuj joined #git
14:32 xaviergmail joined #git
14:32 jon-mac joined #git
14:34 efdetonator joined #git
14:35 CheckDavid joined #git
14:37 fuchstronaut joined #git
14:37 hoangtranwork joined #git
14:42 fees joined #git
14:44 vuoto joined #git
14:45 GT4066 joined #git
14:45 mischat joined #git
14:46 GavinMagnus joined #git
14:48 Fomina joined #git
14:49 wiky joined #git
14:50 ramsub07 joined #git
14:51 GavinMagnus left #git
14:52 johnmilton joined #git
14:53 romerocesar joined #git
14:53 Limes_ joined #git
14:57 OnBrokenWings joined #git
15:02 FunkyAss joined #git
15:05 vjacob joined #git
15:12 tristanp joined #git
15:13 jon-mac joined #git
15:14 fnky joined #git
15:17 davisonio joined #git
15:17 APic joined #git
15:18 Jackneill joined #git
15:21 APic joined #git
15:21 cs02rm0 joined #git
15:21 teadict joined #git
15:22 xcesariox joined #git
15:23 teadict heya, I'm in that situation where you cloned and messed permissions so now all files are listed as modified in the status, y'know? Well... `git config core.fileMode false` fixes that... My question is: Next time I push, will that local config mess up permissions in the server master?
15:23 romerocesar joined #git
15:23 APic joined #git
15:24 selckin git doesn't care about premissions except +x
15:25 selckin and that would be easy to fix
15:25 teadict so I'm golden?
15:25 nidr0x joined #git
15:25 selckin i don't know what you did
15:25 teadict cloned
15:25 teadict repo was created in win apparently
15:25 Khisanth joined #git
15:25 teadict cloned in linux, messed with permissions upon app set-up
15:25 selckin !crlf
15:25 gitinfo to fix problems with line endings on different platforms, check out http://line-endings.gitrecipes.de/
15:25 teadict now status lists all files as modified
15:25 selckin define 'messed with'
15:26 teadict it's permissions, already ruled out line endings
15:26 teadict as in... I started setting up the app and changed some permissions recursively
15:26 teadict some chown probably too
15:26 selckin so you did chmod 777 like an idiot?
15:26 selckin git doesn't care about chown not tracked
15:26 teadict no, I'm not that selckin guy ..
15:27 teadict good
15:27 selckin so what changed
15:27 selckin maybe they where all +x from windows side?
15:27 teadict who knows, prolly
15:27 selckin then commit undoing that madness
15:27 lindenle joined #git
15:27 teadict git config --global core.filemode false
15:28 teadict that ignores this
15:28 teadict although now I'm wondering about side-effects.. mmm
15:28 teadict well, fuck it, status looks good now
15:29 hoangtranwork I've seen it a commit that track chmod +x: https://www.dropbox.com/s/rxnr5wcw1kzswsa/Screenshot_2016-07-09_22.28.34.png?dl=0
15:30 teadict you made me nervous again
15:33 romerocesar joined #git
15:35 kbs joined #git
15:36 kpease joined #git
15:43 azbarcea joined #git
15:43 FuzzySockets joined #git
15:46 fracting joined #git
15:46 mischat joined #git
15:47 DarkoEyes joined #git
15:48 Literphor joined #git
15:52 khmarbaise joined #git
15:54 fosha joined #git
15:55 average left #git
15:58 NeverDie joined #git
15:58 rgrinberg joined #git
16:02 _nwkj86 joined #git
16:03 efdetonator joined #git
16:03 vuoto joined #git
16:03 romerocesar joined #git
16:05 vuoto joined #git
16:06 vuoto joined #git
16:06 Ordentlig joined #git
16:06 safe joined #git
16:06 vuoto_ joined #git
16:07 allcentury joined #git
16:08 fracting joined #git
16:09 fosha Hello. What is the best GUI for git ?
16:10 qsx fosha: !best
16:10 gitinfo fosha: [!bestway] You want to know the best way to do X? If you can give us a proper definition of "best", we'll give you a proper way to do X ;)
16:11 qsx and it is of course gnome-terminal.
16:14 hahuang61 joined #git
16:14 HoierM joined #git
16:15 tokage fosha: just use git
16:15 Bombe qsx, iterm2 is also quite good!
16:15 qsx Bombe: doubt it runs on gnome :>
16:15 Bizkit joined #git
16:15 qsx gnome/wayland/linux, that is.
16:16 Bombe qsx, I’d see that as an advantage!
16:16 qsx *snort*
16:16 Gianormagantrous joined #git
16:16 Gianormagantrous joined #git
16:16 fosha What about TortoeseGit? Previously I've used TortoeseSVN.
16:17 cyan__ joined #git
16:17 fosha I use windows.
16:19 basiclaser joined #git
16:20 satifant i can recommend smartgit
16:21 xcesariox joined #git
16:22 vuoto joined #git
16:24 romerocesar joined #git
16:24 cagmz joined #git
16:25 InfoTest joined #git
16:25 jaguarmagenta joined #git
16:30 Ordentlig I recommend not using windows.
16:31 Ordentlig left #git
16:31 qsx fosha: pure crap imho.
16:31 semantipc joined #git
16:32 ramsub07 joined #git
16:33 fosha Ordentlig, Why you recomend not use windows. I've got used to windows.
16:35 eka joined #git
16:37 nnyk_ joined #git
16:37 rahtgaz joined #git
16:38 semantipc joined #git
16:38 fuchstronaut joined #git
16:39 thierryp joined #git
16:39 rainbyte joined #git
16:39 alkino fosha: troll spotted
16:40 robotroll joined #git
16:42 xaviergmail joined #git
16:42 cdg joined #git
16:43 Electrometro joined #git
16:44 romerocesar joined #git
16:44 thierryp_ joined #git
16:46 mischat joined #git
16:48 blackwind_123 joined #git
16:49 tristanp joined #git
16:49 Seveas qsx: terminator <3
16:49 mwhooker joined #git
16:50 jaguarmagenta joined #git
16:51 mwhooker joined #git
16:52 The_Phoenix joined #git
16:52 tokage I can also recommend not to use Windows.
16:53 felixjet joined #git
16:54 * GyrosGeier agrees
16:57 qsx stop that.
16:57 qsx the question was not whether to use windows or not
16:57 qsx Seveas: well, i just need a more or less dumb terminal.  for everything else i use tmux.
17:00 Seveas I've recently switched from screen to tmux. Screwed up my vim config
17:04 cdown_ joined #git
17:06 qsx emerge emacs
17:06 rover joined #git
17:07 thierryp joined #git
17:08 OnBrokenWings joined #git
17:08 rainbyte joined #git
17:09 cs02rm0 joined #git
17:11 rainbyte_ joined #git
17:13 thierryp_ joined #git
17:13 nnyk_ joined #git
17:13 hosttor joined #git
17:14 romerocesar joined #git
17:16 rainbyte joined #git
17:16 Electrometro joined #git
17:18 rainbyte__ joined #git
17:20 cyan__ joined #git
17:21 pioiytr_ joined #git
17:21 thierryp joined #git
17:22 WaReZ joined #git
17:22 jaguarmagenta joined #git
17:22 rainbyte joined #git
17:26 rainbyte_ joined #git
17:26 catag87 joined #git
17:26 Dyonisos joined #git
17:26 ochorocho__ joined #git
17:28 rainbyte__ joined #git
17:29 lindenle joined #git
17:29 Literphor joined #git
17:30 dopesong joined #git
17:30 thierryp_ joined #git
17:30 rainbyte joined #git
17:32 fracting joined #git
17:33 rainbyte_ joined #git
17:33 nwkj86 joined #git
17:35 efdetonator joined #git
17:35 rainbyte__ joined #git
17:35 texinwien_ joined #git
17:36 xcesariox joined #git
17:37 davisonio joined #git
17:37 thierryp joined #git
17:37 rainbyte joined #git
17:38 Gianormagantrous joined #git
17:38 Gianormagantrous joined #git
17:40 nwkj86 joined #git
17:40 tristanp joined #git
17:41 Seveas hurricane:~$ emerge emacs
17:41 Seveas bash: emerge: command not found
17:41 Seveas !(127,command-not-found) hurricane:~$
17:41 qsx Seveas: https://xkcd.com/1654/
17:42 Seveas it's missing cpan
17:42 Seveas and gem
17:43 Seveas and go get
17:43 Trindaz joined #git
17:43 Seveas also, xkcd jumped the shark years ago...
17:44 Trindaz I just discovered a 3.1Mb text file in a repo I am working on that is unnecessary. Is it bad practice to let a file this big remain?
17:44 qsx cpan -i $1; gem install $1; go get github.com/"$1"/"$1"; then-
17:44 romerocesar joined #git
17:44 cs02rm0 joined #git
17:45 _ikke_ Trindaz: 3MB is small enough to ignore
17:45 qsx Trindaz: it is bad practice to have anything that is not necessary.
17:45 thierryp joined #git
17:45 Trindaz qsx true. _ikke_ thanks - what is a threshold I could keep in mind for the future?
17:45 Trindaz (and where should I have been able to find this in docs somewhere? I google searched briefly but nothing obvious came up that I could see)
17:45 _ikke_ There is no hard limit
17:45 Trindaz ok thanks
17:49 thiago joined #git
17:50 dangerousdave joined #git
17:51 shgysk8zer0_ joined #git
17:51 ShapeShifter499 joined #git
17:53 thierryp joined #git
17:58 oich joined #git
17:58 xcesariox joined #git
17:59 thierryp joined #git
17:59 rainbyte joined #git
18:00 tristanp joined #git
18:02 jenia joined #git
18:02 jenia hello
18:02 jenia when I type `git status` (for example), how do I find out what repo am I querying the status of? Like, what's the path to that repo's `.git` folder?
18:03 wodim joined #git
18:04 _ikke_ git rev-parse --git-dir
18:05 jenia thanks!!
18:06 _ikke_ yw
18:06 thierryp_ joined #git
18:07 semantipc joined #git
18:08 starstrike1234ju joined #git
18:10 happy-dude joined #git
18:14 zacts joined #git
18:14 thierryp joined #git
18:14 hahuang61 joined #git
18:16 simon816 joined #git
18:16 BSaboia joined #git
18:20 diegoviola joined #git
18:22 tristanp joined #git
18:26 thierryp joined #git
18:27 DarkoEyes joined #git
18:31 ramsub08 joined #git
18:34 OnBrokenWings joined #git
18:35 thierryp joined #git
18:36 zeemz joined #git
18:36 YMQNOcHt2Bxj joined #git
18:37 Dro joined #git
18:37 YMQNOcHt2Bxj left #git
18:37 pioiytr_ joined #git
18:37 PerlJam joined #git
18:38 fuchstronaut joined #git
18:40 semantipc joined #git
18:40 Rodya_ joined #git
18:43 thierryp joined #git
18:45 texinwien_ joined #git
18:48 IlNominePatre joined #git
18:49 davisonio joined #git
18:50 Discovery joined #git
18:50 cagmz joined #git
18:50 tristanp joined #git
18:55 thierryp joined #git
18:57 shgysk8zer0_ joined #git
19:02 paul424 joined #git
19:03 tokage joined #git
19:03 thierryp joined #git
19:05 romerocesar joined #git
19:09 nilg joined #git
19:10 mehola joined #git
19:11 thierryp joined #git
19:12 mkoskar joined #git
19:14 fission6 joined #git
19:15 tristanp joined #git
19:17 astrofog joined #git
19:18 TomyLobo joined #git
19:19 thierryp joined #git
19:23 beastd joined #git
19:24 oich joined #git
19:26 thierryp joined #git
19:27 davisonio joined #git
19:27 muelli joined #git
19:29 Rodya_ joined #git
19:30 chitopunk joined #git
19:31 romerocesar joined #git
19:32 rainbyte joined #git
19:32 yqt joined #git
19:32 thierryp joined #git
19:35 fishcooker joined #git
19:36 oich_ joined #git
19:37 bonerx2k joined #git
19:41 thierryp joined #git
19:42 netcarver joined #git
19:45 d4rklit3 joined #git
19:46 kbs joined #git
19:46 romerocesar_ joined #git
19:47 ajf- joined #git
19:49 zumba_addict joined #git
19:50 Rodya_ joined #git
19:50 robotroll joined #git
19:51 thierryp_ joined #git
19:51 romerocesar joined #git
19:53 cs02rm0 joined #git
19:54 Rodya_ joined #git
19:54 fuchstronaut joined #git
19:56 romerocesar_ joined #git
20:01 test_ joined #git
20:03 test_ left #git
20:05 dsdeiz joined #git
20:06 LaptopBrain joined #git
20:08 WifiBrain joined #git
20:09 acetakwas joined #git
20:09 infogulch joined #git
20:09 infogulch hi
20:09 _ikke_ ohai
20:10 ramsub07 joined #git
20:10 pioiytr_ joined #git
20:11 mar77i joined #git
20:12 infogulch so i've been tasked with maintaining a website. it was built using ... unconventional methodoligies. basically a bunch of files in two dirs /live/ and /dev/
20:12 davisonio joined #git
20:12 vuoto joined #git
20:13 infogulch i'd like to make a git repo out of both and be able to push back and forth between them
20:14 infogulch i init-ed and committed the current contents of /live
20:14 alezandro joined #git
20:14 infogulch i already have some changes in /dev, but i'd like to set live as upstream and commit the changes on top of live
20:15 Shentino joined #git
20:15 hahuang61 joined #git
20:15 infogulch on dev i: git init --bare; git remote add live ../live;
20:15 dopesong joined #git
20:16 infogulch but it doesn't want to let me pull
20:16 ac3takwas joined #git
20:16 infogulch any ideas?
20:16 elsevero joined #git
20:17 turnstileJumper joined #git
20:17 Bombe infogulch, you need to make the two repositories have the same root commit, otherwise Git will have no possibility to tell what should be merged.
20:18 d4rklit3 joined #git
20:18 infogulch exactly
20:18 infogulch can i pull from live and set it's current HEAD as the root commit in dev?
20:18 qsx Bombe: wrong.
20:19 qsx the actual merge process is purely based on the trees of the commits to be merged
20:19 settermjd joined #git
20:19 Bombe qsx, oh, okay…
20:19 qsx we’re not playing SVN here.
20:20 jottr joined #git
20:20 qsx infogulch: and what you want is to read !deploy
20:20 gitinfo infogulch: Git is not a deployment tool, but you can build one around it (in simple environments) or use it as an object store(for complex ones). Here are some options/ideas to get you started: http://gitolite.com/deploy.html
20:20 cs02rm0 joined #git
20:21 Bombe Hmm, I have to try that.
20:22 zumba_addict joined #git
20:22 Trindaz joined #git
20:23 Trindaz Is the only way for a local commit to exist on a remote is if I push a branch to the remote that has that commit in it's commit history? Any other ways? https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes makes it seem that way
20:23 Bombe Okay, Git indeed does not care. So, infogulch, cd /dev/; git init; git add .; git commit -m "current state"; git remote add live /live; git merge live/master
20:23 tristanp joined #git
20:23 infogulch ok
20:23 shgysk8zer0_ joined #git
20:24 sangy joined #git
20:24 qsx Trindaz: you need to push something _to_ a ref on the remote side
20:24 shgysk8zer0_ joined #git
20:24 fishcooker joined #git
20:24 qsx Trindaz: the source can be an arbitrary commit-ish
20:25 takwas joined #git
20:25 Trindaz ok, so that means things like branches and tags, which can be pushed up, but the only way a given commit will be accessible on the remote is if it is a parent of the thing that was pushed (is my understanding)
20:26 Trindaz ("up" = "push something _to_")
20:27 qsx Trindaz: a parent oder the commit itself of course.
20:27 Trindaz cool thanks
20:27 Trindaz didn't know you could push a commit directly
20:29 hahuang61 joined #git
20:30 devbug joined #git
20:31 manosnore joined #git
20:31 lindenle joined #git
20:33 Shentino joined #git
20:35 Literphor joined #git
20:38 muelli joined #git
20:39 Vortex34 joined #git
20:47 manosnore joined #git
20:47 cdg joined #git
20:48 zacts joined #git
20:50 thierryp joined #git
20:53 ZenWalker joined #git
20:54 ZenWalker hello, there is not verbose mode for git -am ?
20:55 ZenWalker *git am
20:56 pikajude joined #git
20:56 pikajude hi, i have a fork of a repo in which i'm maintaining a lot of fixes. i usually pull --rebase but that results in all of the differing commits I've made showing up as the latest commits on my fork, and it's 100+ commits now
20:56 pikajude should I do a non-rebase pull, or is there a way to make the repo history more readable
20:58 romerocesar joined #git
21:00 smakarov_ joined #git
21:05 slacker joined #git
21:05 cagmz joined #git
21:07 Goplat joined #git
21:08 slacker I know this is probably asked all the time but I bought a Synology and am trying to make a repo but only "Bare" repos seem to work otherwise i get the denyCurrentBranch erro (which makes sense). My Q is what do most people do? Just use a bare repo or setup hooks of somekind?
21:09 Lyqyd joined #git
21:09 slacker im the only one checking out so i just want a easy storage system for files and stuff
21:10 slacker maybe I should just rsync
21:10 thiago slacker: what's your Git question/
21:11 alezandro1 joined #git
21:11 slacker I know this is probably asked all the time but I bought a Synology and am trying to make a repo but only "Bare" repos seem to work otherwise i get the denyCurrentBranch erro (which makes sense). My Q is what do most people do? Just use a bare repo or setup hooks of somekind?
21:12 slacker are bare repos common?
21:12 mablae joined #git
21:12 tristanp joined #git
21:12 slacker thiago: are bare repos common
21:13 thiago yes, very
21:13 davisonio joined #git
21:14 s34n__ joined #git
21:15 slacker thiago: OK thanks - just never used them so wasnt sure. Thanks agaiin
21:16 thiago for example, all of github, gitlab, bitbucket, etc. are bare repositories
21:16 thiago everything you push to is bare
21:16 s34n__ left #git
21:16 s34n joined #git
21:17 tristanp joined #git
21:17 s34n 'git branch' does not list any branches for me
21:17 s34n 'git status' shows the current branch
21:17 slacker thiago: thanks
21:17 s34n git checkout master > error: pathspec 'master' did not match any file(s) known to git.
21:18 zacts joined #git
21:18 s34n why are my branches borked?
21:18 thiago s34n: because of something you did before that git branch
21:18 s34n brand new repo. I init'ed it then git checkout -b newbranch
21:18 s34n then this
21:19 thiago then you've got the list of all your branches
21:19 thiago all zero of them
21:19 zacts joined #git
21:19 s34n why are there zero?
21:19 thiago because you didn't create any
21:19 s34n doesn't init create one?
21:20 s34n doesn't checkout -b create another?
21:20 thiago no
21:20 thiago checkout -b does, if you pass an existing commit or branch
21:20 thiago did you?
21:21 alezandro joined #git
21:21 alezandro left #git
21:21 s34n thiago: I'm a bit lost. init has always initialized a master branch for me
21:21 shgysk8zer0 joined #git
21:21 thiago it has never done that
21:21 thiago you're in an unborn branch
21:21 mischat joined #git
21:21 thiago if you commit something, it will create a branch for you, called master
21:22 s34n ah
21:22 thiago but until you commit, the branch doesn't exist yet
21:22 s34n I see
21:22 s34n so I checkout -b newb before I committed anything
21:23 thiago no, you commit first, then you rename your branches
21:23 s34n and it still didn't create a branch because there are not commits?
21:24 s34n So if I commit now, I can have a repo with no master branch?
21:25 thiago s34n: why do you care?
21:25 thiago just commit the regular way
21:25 thiago if you don't like the branch's name, rename it
21:26 shinnya joined #git
21:26 aax joined #git
21:26 s34n thiago: I wasn't actually trying to avoid master. I just stumbled into this.
21:27 pioiytr_ joined #git
21:28 catag87 joined #git
21:29 pioiytr_ joined #git
21:29 romerocesar joined #git
21:29 pioiytr_ joined #git
21:30 tristanp joined #git
21:31 zumba_addict joined #git
21:32 teadict left #git
21:34 boombatower joined #git
21:36 cdown_ joined #git
21:40 tristanp joined #git
21:40 fishcooker joined #git
21:41 acetakwas joined #git
21:45 cagmz joined #git
21:46 nwkj86 joined #git
21:47 rgrinberg joined #git
21:48 diogenese joined #git
21:49 sangy joined #git
21:49 manosnore joined #git
21:51 tango_ sync
21:51 tango_ ehm
21:58 skoocda joined #git
21:59 fuchstronaut joined #git
22:02 mihaicris joined #git
22:04 joki joined #git
22:05 tristanp joined #git
22:05 rahtgaz joined #git
22:07 pioiytr_ joined #git
22:09 davisonio joined #git
22:09 pioiytr_ joined #git
22:10 ajf- joined #git
22:14 tristanp joined #git
22:14 cagmz joined #git
22:16 trewe joined #git
22:20 Jeroen52 joined #git
22:24 mellernoia joined #git
22:30 dmj` joined #git
22:30 hahuang61 joined #git
22:32 elastix joined #git
22:32 cdown_ joined #git
22:33 lindenle joined #git
22:35 jenia joined #git
22:36 ahmedelgabri joined #git
22:40 Impaloo joined #git
22:44 texinwien_ joined #git
22:45 texinwien joined #git
22:47 diegoviola joined #git
22:49 romerocesar joined #git
22:50 ac110 joined #git
22:52 githogori joined #git
22:59 githogori joined #git
23:00 romerocesar joined #git
23:00 dopesong joined #git
23:00 ajf- joined #git
23:08 moei joined #git
23:12 mablae_ joined #git
23:21 hahuang61 joined #git
23:22 vivekp joined #git
23:22 vivekp joined #git
23:29 catag87 joined #git
23:29 Lunatrius joined #git
23:30 romerocesar joined #git
23:30 hahuang61 joined #git
23:36 fscala joined #git
23:36 inflames joined #git
23:41 milki didnt last very long
23:48 zacts joined #git
23:52 playfullyExist joined #git
23:55 kulelu88 joined #git
23:55 kulelu88 joined #git

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