Perl 6 - the future is here, just unevenly distributed

IRC log for #git, 2016-11-13

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

All times shown according to UTC.

Time Nick Message
00:00 romerocesar joined #git
00:00 joshszep joined #git
00:01 skyres joined #git
00:06 snthsnth joined #git
00:06 raijin joined #git
00:07 skyres joined #git
00:07 Gsham joined #git
00:13 jokajak joined #git
00:13 skyres joined #git
00:14 jokajak joined #git
00:16 jokajak joined #git
00:18 jokajak joined #git
00:19 skyres joined #git
00:23 jstimm joined #git
00:24 ro00ot joined #git
00:24 ro00ot Hey guys
00:24 gitinfo ro00ot: 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.
00:24 ro00ot I am not too much advanced user of git
00:25 ro00ot however, i am stuck in a scenario where i am scripting a write to deploy a application
00:25 skyres joined #git
00:25 ro00ot on a git repo it has a branch called release/v0.x.x
00:25 ro00ot on a new release it deletes that branch and create again with a new number
00:25 ro00ot how i can i get some files as a blob as a url ?
00:26 ro00ot example: https://example.github.com/raw/org​1/repo1/release/v0.1.0/version.sbt
00:27 jokajak joined #git
00:27 ro00ot i want something like /release/* or something which it gets whatever its their
00:27 ro00ot like we can do git branch release/*
00:28 jokajak joined #git
00:29 alex1a joined #git
00:30 mischat joined #git
00:30 Gsham joined #git
00:30 ro00ot anyone their ? :-)
00:31 skyres joined #git
00:31 alex1a_ joined #git
00:32 Arban joined #git
00:32 own3dz joined #git
00:34 realz joined #git
00:35 jokajak joined #git
00:35 meauses joined #git
00:36 aax joined #git
00:36 dsdeiz joined #git
00:37 skyres joined #git
00:37 alex1a_ joined #git
00:37 dodobrain joined #git
00:37 Shentino joined #git
00:38 shaggycat joined #git
00:43 skyres joined #git
00:43 kyan joined #git
00:48 skyres joined #git
00:49 harrymoreno joined #git
00:50 A5101 joined #git
00:53 dreiss joined #git
00:54 skyres joined #git
00:56 zermous joined #git
00:59 danemacmillan joined #git
01:00 zermous left #git
01:00 skyres joined #git
01:01 jstimm joined #git
01:02 alex1a joined #git
01:03 madebymarkca joined #git
01:04 dhollinger joined #git
01:05 WizJin joined #git
01:06 tyreld joined #git
01:06 skyres joined #git
01:07 arand__ joined #git
01:07 thebope joined #git
01:09 shaggycat joined #git
01:10 fstd_ joined #git
01:10 fstd_ joined #git
01:11 _cyril_ joined #git
01:11 Rodya_ joined #git
01:11 raijin joined #git
01:12 skyres joined #git
01:15 Xandaros joined #git
01:17 fuzzmz joined #git
01:17 archaic joined #git
01:18 skyres joined #git
01:19 mrpackethead joined #git
01:23 jdlksfjdl joined #git
01:23 jstimm joined #git
01:24 jdlksfjdl left #git
01:24 skyres joined #git
01:26 venmx joined #git
01:28 jdd3d joined #git
01:30 skyres joined #git
01:30 dsdeiz joined #git
01:30 dsdeiz joined #git
01:31 mischat joined #git
01:34 bronson_ joined #git
01:34 _cyril_ joined #git
01:36 skyres joined #git
01:39 eivarv joined #git
01:40 Urbany joined #git
01:40 nuck joined #git
01:42 Goplat joined #git
01:42 skyres joined #git
01:46 darkbit joined #git
01:48 skyres joined #git
01:48 mizu_no_oto joined #git
01:49 Rodya_ joined #git
01:51 cagedwisdom joined #git
01:52 duckinja joined #git
01:53 kaldoran joined #git
01:53 jstimm joined #git
01:54 skyres joined #git
01:54 Rodya_ joined #git
01:58 rivarun joined #git
02:00 skyres joined #git
02:00 nivag joined #git
02:01 mizu_no_oto joined #git
02:04 ro00ot joined #git
02:06 skyres joined #git
02:09 duckinja joined #git
02:10 osk joined #git
02:11 skyres joined #git
02:17 venmx joined #git
02:17 skyres joined #git
02:23 skyres joined #git
02:24 pks joined #git
02:26 Starky joined #git
02:27 finalbeta joined #git
02:29 skyres joined #git
02:31 Shentino joined #git
02:32 mischat joined #git
02:33 d^sh_ joined #git
02:34 raijin joined #git
02:35 osk joined #git
02:35 skyres joined #git
02:36 meauses joined #git
02:36 jamsyoung joined #git
02:37 mehola joined #git
02:38 dsdeiz joined #git
02:38 dsdeiz joined #git
02:41 skyres joined #git
02:43 jokajak joined #git
02:46 _ADNWO_ joined #git
02:49 ilbot3 joined #git
02:49 Topic for #git is now Welcome to #git, the place for git help and public-access television programming | Please take the git survey: https://jk.gs/gsurv | Public logs at http://jk.gs/glog | First visit? Read: http://jk.gs/git | Current stable version: 2.10.2 | Getting "cannot send to channel"? /msg gitinfo .voice | git-bisect: No, not like that. Grow up.
02:49 dpower joined #git
02:53 skyres joined #git
02:59 skyres joined #git
03:00 qws-user-1228 joined #git
03:01 pks joined #git
03:02 safe joined #git
03:05 skyres joined #git
03:07 mrpackethead joined #git
03:08 thebope joined #git
03:09 dhollinger joined #git
03:10 Jameser joined #git
03:11 skyres joined #git
03:13 hackel joined #git
03:17 skyres joined #git
03:17 lindenle joined #git
03:19 sunri5e joined #git
03:21 spriz joined #git
03:23 skyres joined #git
03:29 skyres joined #git
03:33 hexagoxel joined #git
03:34 dsdeiz joined #git
03:34 dsdeiz joined #git
03:35 skyres joined #git
03:35 alhariel joined #git
03:36 bluepixel joined #git
03:37 dpower joined #git
03:39 chachasmooth joined #git
03:40 ro00ot joined #git
03:40 skyres joined #git
03:42 a3Dman joined #git
03:46 cagedwisdom joined #git
03:46 skyres joined #git
03:48 cdown joined #git
03:49 Fissure joined #git
03:51 ajunior joined #git
03:51 mehola joined #git
03:52 skyres joined #git
03:53 raijin joined #git
03:55 snthsnth joined #git
03:56 ro00ot joined #git
03:58 mehola joined #git
03:58 skyres joined #git
03:59 mehola joined #git
04:00 bluepixel joined #git
04:04 Atrumx joined #git
04:04 skyres joined #git
04:05 BlaXpirit joined #git
04:07 thekingofbandit joined #git
04:10 skyres joined #git
04:11 Sasazuka joined #git
04:11 cyphase joined #git
04:12 bluepixel joined #git
04:13 MrWoohoo joined #git
04:14 Vortex35 joined #git
04:16 svm_invictvs joined #git
04:16 skyres joined #git
04:17 Limes joined #git
04:18 venmx joined #git
04:18 jaguarmagenta joined #git
04:22 skyres joined #git
04:26 jason237 joined #git
04:27 cyphase joined #git
04:28 skyres joined #git
04:32 idr0p joined #git
04:32 idr0p anyone know a bit about submodules
04:32 Anja_ joined #git
04:34 mischat joined #git
04:35 skyres joined #git
04:37 meauses joined #git
04:39 svm_invictvs joined #git
04:40 a_thakur joined #git
04:41 Eryn_1983_FL joined #git
04:41 skyres joined #git
04:41 cyphase joined #git
04:47 skyres joined #git
04:48 dsdeiz joined #git
04:53 skyres joined #git
04:55 mrpackethead joined #git
04:59 skyres joined #git
05:01 Shentino joined #git
05:04 ro00ot joined #git
05:05 skyres joined #git
05:06 thebope joined #git
05:07 daey_ joined #git
05:08 mauri_ joined #git
05:11 skyres joined #git
05:11 loloz joined #git
05:14 peeps[lappy] joined #git
05:17 Eryn_1983_FL joined #git
05:17 skyres joined #git
05:17 Jameser joined #git
05:23 skyres joined #git
05:24 a_thakur joined #git
05:25 Cabanossi joined #git
05:29 skyres joined #git
05:30 sdsmith joined #git
05:33 steven_a_s joined #git
05:33 wrouesnel2 joined #git
05:35 mischat joined #git
05:36 skyres joined #git
05:36 svm_invictvs joined #git
05:38 elmcrest joined #git
05:38 meauses joined #git
05:38 richardlitt joined #git
05:38 henriquev joined #git
05:38 thecomedian joined #git
05:38 Awesomecase joined #git
05:39 twisted` joined #git
05:39 teadrop_ joined #git
05:39 harrymoreno joined #git
05:40 dodobrain joined #git
05:40 cspotcode joined #git
05:41 ToeSnacks joined #git
05:41 zeller joined #git
05:41 mehdi___ joined #git
05:41 joco42 joined #git
05:41 Iacobus_ joined #git
05:41 felowe joined #git
05:42 wizonesolutions joined #git
05:42 CEnnis91 joined #git
05:42 skyres joined #git
05:42 angular_mike_ joined #git
05:43 nd joined #git
05:46 sdsmith_ joined #git
05:47 a_thakur joined #git
05:47 languitar joined #git
05:48 skyres joined #git
05:50 A5101 joined #git
05:53 lindenle joined #git
05:54 a_thakur_ joined #git
05:54 skyres joined #git
06:00 skyres joined #git
06:01 kyan_ joined #git
06:02 pks joined #git
06:04 zacts joined #git
06:05 theskillwithin joined #git
06:05 theskillwithin why is my github profile image not showing https://i.imgur.com/eOjRkmN.png
06:05 theskillwithin https://github.com/theskillwithin
06:06 skyres joined #git
06:07 phroa theskillwithin: the email you use to commit probably isn't associated with your account.
06:07 phroa (it doesn't have to be the primary, just _an_ email)
06:08 satya4ever joined #git
06:09 theskillwithin hmm
06:10 theskillwithin i just tried git config --global user.email “”   didnt work
06:11 theskillwithin hmm
06:11 theskillwithin it appears that now I have set my email once, it wont let me change it
06:12 theskillwithin maybe ill do it the other way around and add that email to my github
06:12 skyres joined #git
06:13 theskillwithin YAY
06:14 bluepixel joined #git
06:14 mauri__ joined #git
06:18 skyres joined #git
06:19 jason237 joined #git
06:20 qws-user-1229 joined #git
06:20 jokajak joined #git
06:22 ngperfex joined #git
06:23 ArchNoob joined #git
06:24 satya4ever joined #git
06:24 skyres joined #git
06:27 venmx joined #git
06:30 skyres joined #git
06:31 kesslerfrost joined #git
06:33 dreiss joined #git
06:35 a_thakur joined #git
06:36 mischat joined #git
06:36 skyres joined #git
06:36 shubhnik joined #git
06:37 WaReZ joined #git
06:39 somiaj left #git
06:40 fatalhalt joined #git
06:40 bluezone joined #git
06:42 skyres joined #git
06:47 adac joined #git
06:48 skyres joined #git
06:50 nilg joined #git
06:54 skyres joined #git
06:54 LucaTM joined #git
06:57 lxsameer joined #git
06:58 fayimora_ joined #git
06:58 lxsameer hey guys, I have around 2000 commits in a repository and my .git directory is 9Mb while the whole project is about 12Mb (including .git), how can i find the problem ?
06:58 parsnip joined #git
07:00 phroa erm, what's the problem?
07:00 skyres joined #git
07:03 fayimora joined #git
07:04 joshszep joined #git
07:05 meauses joined #git
07:06 skyres joined #git
07:07 vrld joined #git
07:07 thebope joined #git
07:08 Murii joined #git
07:12 skyres joined #git
07:18 skyres joined #git
07:20 pks joined #git
07:20 theShirbiny joined #git
07:21 exxi joined #git
07:22 theShirbiny Hi, is there a way to block running 'git filter-branch' on a git server?
07:22 a_thakur joined #git
07:22 vuoto joined #git
07:24 skyres joined #git
07:25 phroa well, you can deny force pushes.  you can't block filter-branch since that's a local operation that doesn't affect remotes until you push the updated branch ref.
07:25 phroa man git-config
07:25 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
07:25 jokajak joined #git
07:25 jokajak joined #git
07:26 theShirbiny phroa, What if i'm using a managed service github or bitbucket?
07:27 Eryn_1983_FL joined #git
07:28 phroa repo settings -> protected branches.  I think it's a common feature.
07:28 moritz at least github also allows you to deny force pushes
07:28 moritz gitlab does too
07:28 phroa phabricator as well, if you're weird
07:28 theShirbiny phroa, oh just saw it, thanks everyone
07:30 skyres joined #git
07:35 Xethron joined #git
07:36 polyzen joined #git
07:36 mischat joined #git
07:36 skyres joined #git
07:38 charlie_wood joined #git
07:42 bluepixel joined #git
07:42 skyres joined #git
07:45 peeps[lappy] joined #git
07:47 Seveas lxsameer: why do you think there is a problem?
07:48 lxsameer Seveas: I may have some big files in my history
07:48 Seveas as 12mb, I don't think that qualifies as big. Might also be simply in need of a git repack
07:48 skyres joined #git
07:53 satya4ever joined #git
07:54 theskillwithin left #git
07:54 skyres joined #git
07:56 tjone270_ joined #git
07:57 sssilver joined #git
08:00 ngladitz joined #git
08:00 ngladitz joined #git
08:01 skyres joined #git
08:03 jokajak joined #git
08:05 Derperperd joined #git
08:07 skyres joined #git
08:10 smithbone joined #git
08:11 finalbeta joined #git
08:13 skyres joined #git
08:16 slappymcfry joined #git
08:17 jstein joined #git
08:19 skyres joined #git
08:19 meauses joined #git
08:20 emPi joined #git
08:20 finalbeta joined #git
08:21 a_thakur joined #git
08:25 skyres joined #git
08:26 moop joined #git
08:26 solrize joined #git
08:27 venmx joined #git
08:31 skyres joined #git
08:31 dpower joined #git
08:31 Oebele joined #git
08:32 mrpackethead joined #git
08:32 UniFreak joined #git
08:34 lindenle joined #git
08:36 bluezone joined #git
08:37 skyres joined #git
08:37 mischat joined #git
08:38 blahdodo joined #git
08:40 kesslerfrost joined #git
08:40 moop joined #git
08:41 moop joined #git
08:41 dodobrain joined #git
08:43 skyres joined #git
08:44 lordjancso joined #git
08:47 bluezone joined #git
08:49 skyres joined #git
08:52 Oatmeal joined #git
08:54 dpower joined #git
08:55 skyres joined #git
08:55 multiproc joined #git
08:58 ro00ot joined #git
08:58 ahmedelgabri joined #git
09:00 hhee1 joined #git
09:01 skyres joined #git
09:04 FunkyAss joined #git
09:07 skyres joined #git
09:07 thebope joined #git
09:09 cdown joined #git
09:11 CheckDavid joined #git
09:13 skyres joined #git
09:19 skyres joined #git
09:22 bannakaffalatta joined #git
09:26 skyres joined #git
09:31 davimore joined #git
09:32 skyres joined #git
09:33 shubhnik joined #git
09:37 emPi joined #git
09:37 Faylite joined #git
09:38 ochorocho__ joined #git
09:38 mischat joined #git
09:39 skyres joined #git
09:42 brk_ joined #git
09:45 skyres joined #git
09:47 ismithers joined #git
09:47 [twisti] joined #git
09:51 skyres joined #git
09:53 Siegfried joined #git
09:54 zeroed joined #git
09:57 skyres joined #git
10:00 ilyaigpetrov joined #git
10:03 courrier joined #git
10:03 skyres joined #git
10:05 finalbeta joined #git
10:08 ilyaigpetrov joined #git
10:10 skyres joined #git
10:10 joki joined #git
10:12 manuels joined #git
10:14 anonzadas joined #git
10:22 ThomasLocke joined #git
10:22 ThomasLocke joined #git
10:23 justanotheruser joined #git
10:23 diogenese joined #git
10:28 venmx joined #git
10:28 mablae joined #git
10:28 Endarked joined #git
10:30 multiproc joined #git
10:30 sagerdearia joined #git
10:32 Oatmeal joined #git
10:33 ybden joined #git
10:35 crater2150 joined #git
10:36 Jackneill_ joined #git
10:39 mischat joined #git
10:39 ShapeShifter499 joined #git
10:44 venmx joined #git
10:44 ayaka joined #git
10:45 ayaka does git://git.sumomo.pri/linux-kernel.git;tag=v4.7 equals to git  clone -b v4.7 git.sumomo.pri:linux-kernel?
10:47 ro00ot joined #git
10:47 skyres joined #git
10:48 tjone270 joined #git
10:50 canton7 ayaka, that ';tag=v4.7' stuff isn't standard git
10:50 ayaka canton7, then I could choose a branch
10:50 canton7 it's probably equal to 'git clone -b v4.7 git://git.sumomo.pri:linux-kernel.git', but that's a guess based on what ';tag=v4.7' might do
10:50 Limes_ joined #git
10:52 ayaka canton7,  but git ls-remote git.sumomo.pri/linux-kernel.git didn't work for me
10:53 ayaka git ls-remote git.sumomo.pri:linux-kernel does
10:53 canton7 oops, I meant 'git://git.sumomo.pri/linux-kernel'git
10:53 canton7 oops, I meant 'git://git.sumomo.pri/linux-kernel.git'
10:53 skyres joined #git
10:53 canton7 remember that there are 3 (well, 4) types of git urls, see 'git urls' under man git clone
10:53 gitinfo the git-clone manpage is available at http://jk.gs/git-clone.html
10:54 canton7 'git://' is over the git protocol, and the path starts with a / not a :
10:54 canton7 if you don't have a prefix, it's an scp-style ssh url, and a colon separates the path and host
10:54 ayaka canton7, with the git:// prefix it can't work either
10:54 ayaka I think it would only support ssh?
10:55 canton7 so 'git.sumomo.pri:linux-kernel' is an scp-style ssh url, and 'git://git.sumomo.pri/linux-kernel.git' is a git url
10:55 canton7 well, your original post said 'git://git.sumomo.pri/linux-kernel.git;tag=v4.7', which is a git url
10:55 canton7 ... as given by the 'git://' prefix
10:56 re1 joined #git
10:56 leeN joined #git
10:57 fayimora joined #git
10:58 ayaka canton7, thank you I know how to make it works now
10:58 canton7 cool
10:59 Akimb joined #git
10:59 skyres joined #git
11:05 oskarkv joined #git
11:05 skyres joined #git
11:06 leehambley joined #git
11:08 Anupkumar joined #git
11:10 eivarv joined #git
11:11 ArchNoob joined #git
11:11 skyres joined #git
11:14 ieee joined #git
11:15 venmx joined #git
11:17 skyres joined #git
11:20 aax joined #git
11:21 nwkj86 joined #git
11:22 multiproc joined #git
11:24 meauses joined #git
11:24 skyres joined #git
11:25 Starky joined #git
11:28 Starky joined #git
11:28 NimeshNeema joined #git
11:30 pks joined #git
11:31 skyres joined #git
11:32 jackneill__ joined #git
11:33 m0viefreak joined #git
11:33 anonzadas joined #git
11:38 skyres joined #git
11:38 shaggycat joined #git
11:39 govg joined #git
11:40 mischat joined #git
11:44 Starky joined #git
11:45 skyres joined #git
11:45 Starky joined #git
11:51 skyres joined #git
11:55 irco joined #git
11:55 cdown joined #git
11:57 skyres joined #git
12:00 a_thakur joined #git
12:02 Gloomy joined #git
12:03 skyres joined #git
12:04 Corosus__ joined #git
12:08 raijin joined #git
12:09 khfeng joined #git
12:09 skyres joined #git
12:10 phanimahesh joined #git
12:11 zeroed joined #git
12:16 skyres joined #git
12:18 mizu_no_oto joined #git
12:18 jstein__ joined #git
12:19 aswen joined #git
12:22 Gloomy Hi :)
12:22 skyres joined #git
12:22 Gloomy (complete noob here)
12:22 Gloomy I'm a bit confused with what rebase does
12:22 Gloomy as opposed to merge ?
12:23 ToBeCloud joined #git
12:24 InfoTest joined #git
12:25 _ikke_ Gloomy: rebase takes a range of commits, and reapplies them on top of another commit (and moves the branch pointer along with it)
12:25 _ikke_ Merge creates a new commit that has the combined changes of two branches
12:26 _ikke_ Gloomy: rebasing a feature branch before merging it makes the history linear (git can fast forward to the latest commit in the feature branch)
12:26 _ikke_ rebase also has an interactive mode which lets you reorder, change and remove commits
12:27 _ikke_ rebasing means rewriting history, which you need to be careful off, especially with published history
12:27 _ikke_ merge does not, so is always safe
12:27 _ikke_ Gloomy: Is that a bit clear?
12:28 Gloomy I'm try to follow what you say but some words I don't understand :) What does it mean to "apply"a commit on top of another one ?
12:28 Gloomy trying*
12:28 skyres joined #git
12:28 KevinDF_ joined #git
12:29 _ikke_ Gloomy: take the changes a specific commit introduces, and make the same changes on top of another commit, along with the commits message and author information
12:29 _ikke_ step 1: make a diff of the commit against its parent. step 2: apply that diff on a specific commit
12:30 _ikke_ step 3. commit with the same message and author information
12:30 _ikke_ Gloomy: Is that more clear?
12:30 KevinDF joined #git
12:31 KevinDF joined #git
12:31 Gloomy Oh ok. Yes :) But if you develop on two current branches concurrently, how does rebase know what diffs to apply?
12:31 Gloomy Is it like with merge where it will give an error? (and ask you to solve conflicts manually)?
12:32 _ikke_ So you give rebase a 'base' commit
12:32 Gloomy yes
12:33 _ikke_ if you give nothing else, it will take each commit that is reachable from the current branch, but exclude every commit that is reachable from the base branch
12:33 King_Hual joined #git
12:33 _ikke_ In practice, this means each commit in the feature branch for example
12:33 Gloomy ok
12:34 _ikke_ If a conflict happens, it does stop and asks you to solve the conflict
12:34 skyres joined #git
12:35 lindenle joined #git
12:36 inflames joined #git
12:38 Gloomy Ok :) So it's like stacking together a set of commits? Instead of having : Commit1 ("solved bug 1") , Commit3 ("solved bug 2"), Commit3 ("added feature 1") you get something like commit("solved bug 1, solved bug 2, added feature 1")
12:39 Gloomy And you can apply single commit wherever you want
12:39 ayaka left #git
12:40 Gloomy Ok I'm really bad at expressing it but I think I got it :p Just one more question, why do you say it makes the history 'linear'?
12:40 skyres joined #git
12:40 mischat joined #git
12:41 _ikke_ you can squash commits, but that's not the default behaviour
12:41 _ikke_ It will keep all commits
12:41 _ikke_ by default
12:41 Gloomy Ok
12:41 _ikke_ Hold on, I'm making a visualization
12:41 Gloomy But it will apply them all at the same time
12:41 Gloomy Thank you :)
12:43 mostlybadfly joined #git
12:44 robotroll joined #git
12:46 skyres joined #git
12:48 dsdeiz joined #git
12:49 Ozymandy joined #git
12:51 Ozymandy Hi. I've got the question https://pp.vk.me/c836722/v83​6722635/ab40/N69SHhx_UFI.jpg What will happen when I will make merge Branch A? Can I merge Branch B like in the pic? I need only resolve merge conflict?
12:52 skyres joined #git
12:52 _ikke_ Ozymandy: If I understand it correctly, then it will just fast-forward A in this case
12:53 Charliechin joined #git
12:53 ochorocho__ joined #git
12:53 venmx joined #git
12:53 _ikke_ Gloomy: So this is the situation: http://g.jk.gs/Cz.png
12:53 Ryanar joined #git
12:53 Gloomy Yup
12:54 _ikke_ so if you are on branch feature, and rebase on master, the following will happen
12:55 Ozymandy _ikke_: So I can do like on my pic?
12:56 _ikke_ Gloomy: http://g.jk.gs/CA.png
12:57 _ikke_ compare those two diagrams
12:57 Noldorin joined #git
12:57 _ikke_ Ozymandy: Sorry, it's not clear to me what you want to achieve
12:57 _ikke_ On what branch are you now?
12:57 Gloomy Ooh, ok
12:57 _ikke_ Gloomy: Note that I've named e and f now e' and f'
12:57 _ikke_ Because they are not the exact same commits
12:57 _ikke_ (hashes are different)
12:58 mizu_no_oto joined #git
12:58 Gloomy Yes, since they were applied on d
12:58 _ikke_ correct
12:58 Gloomy ok I think I've gotten it now :)
12:58 _ikke_ That's the most basic thing git rebase does
12:58 skyres joined #git
12:58 _ikke_ Note that master still does not contain those changes yet (so you still need to merge feature in to master
12:59 Gloomy Which at this point doesn't do anything except from changing some pointers?
12:59 Ozymandy _ikke_: https://pp.vk.me/c836722/v83​6722635/ab4c/w5P2VJHF6Vs.jpg I remade my pic. Now I miss one commit. I need to do another branch from previous of last Branch A commit
13:01 Gloomy And in the end, the only difference between doing this and merging feature and master on the first pic is only that the history will be more readable this way?
13:02 Gloomy -only
13:02 _ikke_ Gloomy: It depends
13:02 _ikke_ it will be linear
13:02 PCatinean joined #git
13:02 _ikke_ Some find that more readable, but on the other hand, you'll loose the boundaries of the feature branch
13:02 Gloomy yes
13:02 Gloomy Ok :)
13:03 _ikke_ An alternative is to use rebase + non-ff merge
13:03 _ikke_ rebase to solve conflicts before merging to master
13:03 _ikke_ and non-ff to force creating a merge commit (this is what services like github, gitlab, bitbucket do when merging a feature request)
13:04 skyres joined #git
13:05 Gloomy Hmm haven't heard about (non) fast-forward merges yet, will read about it later :) Have to go now. Thanks a lot for taking the time to explain !!
13:05 _ikke_ Gloomy: No problem
13:06 Ozymandy _ikke_: Can you help me with my question with new pic?
13:08 _ikke_ Ozymandy: Yes, hold on
13:11 skyres joined #git
13:12 anuxivm joined #git
13:12 sdothum joined #git
13:12 vmiklos joined #git
13:17 skyres joined #git
13:18 _ikke_ Ozymandy: Is this your situation? http://g.jk.gs/CB.png
13:19 Ozymandy _ikke_: No, on my pic there is from botton to top
13:20 Ozymandy I mean Branch A created from branch master and then merged to master. Branch B created from branch A and then merged to master
13:21 _ikke_ The arrows point to the parents
13:22 _ikke_ So A is the first commit on master
13:23 Ozymandy _ikke_: Wait, I write graph with my situation. How to write on g.jk.gs green label?
13:23 skyres joined #git
13:23 _ikke_ [shape=box style=filled fillcolor=green]
13:25 Ozymandy _ikke_: give me example of code graph you write for me, i change it for my situation
13:25 _ikke_ sure, sec
13:25 _ikke_ Playing a bit with the style
13:27 _ikke_ Ozymandy: https://gist.github.com/Ikke/59​231d9fcce05d5453e12110cf9685d5
13:28 jluc joined #git
13:29 jason237 joined #git
13:29 skyres joined #git
13:29 _ikke_ Ozymandy: brb
13:30 Ozymandy _ikke_: I see, I try to write like I need
13:31 bluepixel joined #git
13:35 vmiklos joined #git
13:35 skyres joined #git
13:35 Eryn_1983_FL joined #git
13:37 Ozymandy _ikke_: http://g.jk.gs/CM.png here is my situation
13:37 Ozymandy g->c - merge Branch A
13:38 Ozymandy k->d merge Branch b
13:40 _ikke_ Right, though, you have the arrows up-side-down
13:40 _ikke_ in git, each commit points to its parent, not the other way aroudn
13:41 skyres joined #git
13:41 mischat joined #git
13:41 _ikke_ and branch A pointing to e is a bit weird, (i'd expect it to point to g
13:41 _ikke_ )
13:42 Ozymandy _ikke_: sorry, so what happens with Branch B when I merge Branch A to master?
13:43 Ozymandy And can I then merge Branch B to master like in my graph?
13:43 _ikke_ merging a branch does not affect any other branch
13:43 Ozymandy I'm not sure that it's good idea. I think I will crash my repo
13:43 _ikke_ It will hardly crash your rpeo
13:43 _ikke_ repo
13:44 _ikke_ Right now, there is nothing to actually merge into master
13:44 _ikke_ because master already has everything
13:44 _ikke_ (at most, you can do a fast-forward merge)
13:44 Ozymandy _ikke_: what do you mean?  >nothing to actually merge to master
13:45 _ikke_ If the situation is as you sketched, everything is already merged into master
13:46 Ozymandy _ikke_: Hmm, I write future situation for you. I try to predict what happens
13:47 Vangelis joined #git
13:47 _ikke_ Ok
13:47 _ikke_ Can you also show what the situation is now?
13:47 skyres joined #git
13:48 d0nn1e joined #git
13:49 Ozymandy _ikke_: http://g.jk.gs/CP.png I tried to write, but It seems not clearly, doesn't it?
13:49 _ikke_ Where is branch B?
13:50 Ozymandy _ikke_: Now I haven't it, I wants to make it.
13:51 _ikke_ ok
13:51 Ozymandy _ikke_: https://pp.vk.me/c836722/v83​6722635/abc6/qiGJg5cDH3Y.jpg does it seem more clearly?
13:51 _ikke_ But the history as you showed it looks perfectly nromal
13:53 skyres joined #git
13:54 mischat joined #git
13:55 mischat joined #git
13:56 Ozymandy _ikke_: thank you, will try do as I showed
13:56 mischat joined #git
13:57 mischat joined #git
13:59 skyres joined #git
14:01 dviola joined #git
14:02 Puffball joined #git
14:05 skyres joined #git
14:11 skyres joined #git
14:16 aard_ joined #git
14:17 skyres joined #git
14:19 mizu_no_oto joined #git
14:19 Puffball_ joined #git
14:24 skyres joined #git
14:27 jaguarmagenta joined #git
14:28 danslo joined #git
14:30 Faylite joined #git
14:30 skyres joined #git
14:31 chibby0ne joined #git
14:32 [twisti] does git add -A not add everything ? im trying to store a program and its config files in a git repo and after deleting and checking it out again, it stops working
14:33 [twisti] so im wondering if git add -A maybe doesnt add hidden files, or files starting with ., or anything like that (i dont have a .gitignore)
14:33 meauses joined #git
14:36 skyres joined #git
14:37 _ikke_ [twisti]: It does not add untracked files
14:37 _ikke_ Oh wait, it does
14:37 [twisti] what does that mean, exactly ? i thought thats exactly what it did
14:37 [twisti] oh ok
14:38 chibby0ne [twisti], it adds all files including files starting with .
14:39 [twisti] hah, i figured it out, it was the autocrf thing
14:39 jfxoe joined #git
14:39 [twisti] youd think a program like eclipse that runs on a gazillion computers would be capable of dealing with either line ending type
14:40 steelsw0rd joined #git
14:42 skyres joined #git
14:43 mizu_no_oto joined #git
14:43 Puffball joined #git
14:48 skyres joined #git
14:49 shokk joined #git
14:50 hhee1 joined #git
14:51 shinnya joined #git
14:52 [twisti] whats the default value of autocrlf ? i made the mistake of follwing a tutorial that told me to use --global when setting it, but i like my gits behaviour just fine other than for this repo, so id rather undo the global change and make it a local one only
14:54 cdown joined #git
14:54 skyres joined #git
14:56 snowkidind joined #git
14:58 moritz [twisti]: so just delete your ~/.gitconfig and delete the setting from it?
14:59 moritz or git config --global --unset autocrlf
14:59 [twisti] moritz: so there is no cli way to do it ? that seems hacky
14:59 vrld joined #git
14:59 [twisti] thats what i was looking for, thanks
14:59 moritz [twisti]: it's right there in the man page (hint, hint)
15:00 zeroed joined #git
15:00 zeroed joined #git
15:01 skyres joined #git
15:06 hue joined #git
15:06 exxi joined #git
15:07 thebope joined #git
15:07 skyres joined #git
15:13 skyres joined #git
15:15 steve joined #git
15:15 rahtgaz joined #git
15:16 kyan joined #git
15:16 sunri5e joined #git
15:17 ArchNoob joined #git
15:18 jfr_ joined #git
15:19 skyres joined #git
15:19 shaggycat joined #git
15:21 isysd joined #git
15:22 Pulp joined #git
15:22 PCatinean joined #git
15:24 Rodya_ joined #git
15:25 skyres joined #git
15:27 zeroed joined #git
15:27 zeroed joined #git
15:28 meauses joined #git
15:30 steve joined #git
15:31 Starky joined #git
15:32 skyres joined #git
15:37 ryez joined #git
15:38 vuoto joined #git
15:38 skyres joined #git
15:39 meauses joined #git
15:40 Ryanar joined #git
15:41 danslo joined #git
15:44 skyres joined #git
15:46 cdg joined #git
15:47 re1_ joined #git
15:48 NeverDie joined #git
15:50 skyres joined #git
15:53 UniFreak joined #git
15:56 skyres joined #git
15:59 dan2k3k4 joined #git
15:59 cagmz joined #git
16:00 BenderRodriguez joined #git
16:02 mischat joined #git
16:02 skyres joined #git
16:03 mischat joined #git
16:03 rewt joined #git
16:04 mischat joined #git
16:05 ybden- joined #git
16:06 crater2150 joined #git
16:07 WizJin joined #git
16:08 achlys joined #git
16:09 skyres joined #git
16:10 Urbany joined #git
16:10 ojdo joined #git
16:10 fuzzmz joined #git
16:11 taargus429496729 left #git
16:14 raspado joined #git
16:15 skyres joined #git
16:15 fmcgeough joined #git
16:15 mischat joined #git
16:16 mischat joined #git
16:20 achlys joined #git
16:21 ArchNoob joined #git
16:21 skyres joined #git
16:21 zeroed joined #git
16:22 eivarv joined #git
16:23 pks joined #git
16:27 justanotheruser joined #git
16:27 multi_io_ joined #git
16:27 skyres joined #git
16:28 dreiss joined #git
16:29 sangy joined #git
16:29 zeroed joined #git
16:32 Limes_ joined #git
16:34 skyres joined #git
16:40 skyres joined #git
16:40 raijin joined #git
16:40 dsdeiz joined #git
16:40 dsdeiz joined #git
16:41 artgoeshere joined #git
16:42 fmcgeough joined #git
16:43 mizu_no_oto joined #git
16:44 eivarv joined #git
16:46 skyres joined #git
16:46 xocket joined #git
16:46 Vinnie_win joined #git
16:48 ArchNoob joined #git
16:49 mischat joined #git
16:50 mischat joined #git
16:51 b3kN joined #git
16:51 mischat joined #git
16:52 skyres joined #git
16:52 zeroed joined #git
16:52 zeroed joined #git
16:53 h1d joined #git
16:58 skyres joined #git
17:02 b3kN joined #git
17:03 vuoto joined #git
17:03 Khisanth joined #git
17:05 skyres joined #git
17:05 tvw joined #git
17:05 re1_ joined #git
17:07 re1_ joined #git
17:07 thebope joined #git
17:08 jaguarmagenta joined #git
17:08 Akimb joined #git
17:09 lindenle joined #git
17:11 skyres joined #git
17:11 venmx joined #git
17:12 G1eb left #git
17:12 Vangelis joined #git
17:13 dsdeiz joined #git
17:13 dsdeiz joined #git
17:13 raijin joined #git
17:17 skyres joined #git
17:17 finalbeta joined #git
17:21 trelane joined #git
17:21 trelane joined #git
17:21 jstimm joined #git
17:22 leolrrj joined #git
17:23 leolrrj hey guys... I was adding some folder that is a git repository, so in github it recognizes it as a submodule... now I removed the .git folders under these "submodules", did a commit and push, but I still cannot see the files under it... how can I fix it?
17:24 skyres joined #git
17:24 ksawery joined #git
17:25 moritz leolrrj: need to 'git add' the files
17:25 moritz and commit, of course
17:25 moritz also, !gui applies
17:25 gitinfo Graphical user interfaces are not supported here. If you want to get support, it needs to be through the git CLI. Reasons: 1) Because very few people here use the graphical interface. 2) Because giving instructions for GUI's is difficult. 3) The command line gives you a history of what commands you have executed.
17:28 shokk joined #git
17:30 King_Hual joined #git
17:30 skyres joined #git
17:31 Domhack joined #git
17:32 re1_ joined #git
17:36 xocket Hi
17:36 skyres joined #git
17:36 xocket How did you solve http://stackoverflow.com/questions/26097568/git-p​ull-error-unable-to-create-file-invalid-argument ?
17:39 canton7 xocket, your problem is that you're trying to clone a git repo which has files whose names aren't valid on windows?
17:39 mischat joined #git
17:39 xocket I am on raspberry pi and I am cloning on the usb device
17:40 moritz so, create an ext3 or so partition on the USB device
17:40 moritz and use that for cloning the git repo into
17:41 canton7 xocket, is your "usb device" a fat32 or ntfs filesystem?
17:41 xocket PTTYPE="dos"
17:41 xocket sorry no
17:41 canton7 xocket, in which case, that SO post already has the answers, so I'm not sure what else we're supposed to add :P
17:41 xocket TYPE="vfat"
17:41 canton7 right, so it's fat32
17:41 mischat joined #git
17:41 canton7 and doesn't support some characters in filenames, as that SO thread explains
17:42 mischat joined #git
17:42 dreiss joined #git
17:42 Derperperd joined #git
17:43 xock_stream joined #git
17:43 skyres joined #git
17:43 xock_stream moritz: Is there a reason why ext3?
17:44 axk4545 joined #git
17:45 jast well as long as you use a UNIX-y filesystem, it shouldn't matter that much which one it is
17:46 axk4545 how do I resolve local being one commit ahead but not having all the changes from the remote?
17:46 jast DOS/Windows filesystems tend to shred files with certain characters or if there are uppercase/lowercase conflicts
17:46 ruby joined #git
17:47 rewt axk4545, so it's 1 ahead and some behind?  rebase
17:47 xock_stream I am asking because I am curious and I have no experience on file system
17:47 jast axk4545: what do you want to achieve? get the changes from the remote, and ultimately push?
17:48 axk4545 left #git
17:48 jast xock_stream: ext3 (and its successor, ext4) is the traditional default filesystem on Linux, it's very battle-tested :)
17:48 cbreak zfs ftw!
17:48 rewt xock_stream, as that SO link explains, "vfat" does not allow certain characters, while ext3/ext4 allows them
17:48 cbreak vfat sucks
17:48 jast zfs on linux is a bit tricky, though, isn't it?
17:48 thiago it is
17:48 cbreak jast: not that tricky
17:48 thiago btrfs is easier to use than zfs
17:49 cbreak just compile it, install it, done
17:49 jast I use btrfs on my system
17:49 xock_stream thanks guys
17:49 jast so far it hasn't trashed too many files ;)
17:49 cbreak I read BTRFS has severe data loss issues
17:49 skyres joined #git
17:49 thiago not recently
17:49 cbreak unless you limit yourself to single disk / mirror setups
17:49 cbreak apparently they even want to remove parity support
17:49 jast a few years ago a few of my files did disappear, but I can't recall any recent issues with my files
17:49 cbreak maybe they fixed the issues, read about that problem last year
17:49 jast well I'm not a big fan of parity anyway
17:49 moritz ext3 or ext4  is a robust choice where you won't do much wrong if you don't know much about it, which is why I recommended it
17:50 cbreak jast: parity rocks :)
17:50 sgtbigman joined #git
17:50 thiago right
17:50 jast I much prefer 1/10 type setups
17:50 cbreak especially if you have many disks
17:50 cbreak jast: but that's fragile and inefficient
17:50 * thiago used reiserfs for his external disks up until a few years ago
17:50 jast how is it fragile?
17:50 cbreak because your data is toast if you lose two disks if you're u nlucky
17:51 cbreak or if you have a read error while replacing a failed disk, which is much more likely
17:51 Endarked joined #git
17:51 cbreak with a parity setup (like raidz2 or raid6) you could recover from that easily
17:51 thiago the point of having two disks is that they don't fail at the same time
17:51 cbreak anyway, I guess you have backups
17:51 cbreak and btrfs should tell you if it has data loss
17:51 jast okay, good point, I guess. at this point I'm actually using a two-disk setup, so there's not much of a practical choice anyway
17:51 cbreak thiago: the problem is that if one fails, you replace it
17:52 cbreak while replacing you have no redundancy but a high likelyhood of errors
17:52 thiago I know, but it's better than a single disk
17:52 thiago three disks is better, of course
17:52 thiago you need 3 for RAID5
17:52 jast btrfs has its own redundancy features and you can tell it how many copies of each file you want
17:52 cbreak in my nas I have 6 disks with raidz2
17:52 jast just put 3 and let it worry about the details :)
17:52 cbreak so I lose 2 disks of storage, but can recover from 2 failures
17:52 cbreak jast: with that you lose 66% capacity though :)
17:52 jast I believe zfs does this stuff, too
17:53 cbreak zfs can duplicate files
17:53 cbreak but it's usually only done for meta data
17:53 cbreak the zfs root block is stored six times I think
17:53 cbreak anyway, ubuntu has zfs built-in these days
17:54 cbreak didn't have a chance to try it yet though, since my zpools on OS X are encrypted with apple core storage, which linux can't decrupt
17:54 cbreak but it should work ;D
17:54 jast the downside of using ubuntu, though, is that it's ubuntu
17:55 cbreak isn't it the most popular distribution of the linux kernel, after android?
17:55 dodobrain joined #git
17:55 skyres joined #git
17:56 jast popular =/= fit for purpose ;)
17:56 dodobrain joined #git
17:58 venmx joined #git
17:59 mischat joined #git
18:00 mischat joined #git
18:00 done joined #git
18:02 skyres joined #git
18:02 Aboba joined #git
18:03 SteffanW joined #git
18:03 Vangelis joined #git
18:06 blackwind_123 joined #git
18:08 raijin joined #git
18:08 skyres joined #git
18:09 PCatinean joined #git
18:14 skunkz joined #git
18:14 justanotheruser joined #git
18:14 nettoweb joined #git
18:14 skyres joined #git
18:15 solrize joined #git
18:15 mischat joined #git
18:15 sea-gull joined #git
18:15 Rodya_ joined #git
18:16 Gloomy joined #git
18:16 SwiftMatt joined #git
18:17 Goplat joined #git
18:17 cagedwisdom joined #git
18:17 venmx joined #git
18:18 Aboba_ joined #git
18:21 tjone270_ joined #git
18:21 skyres joined #git
18:22 Eryn_1983_FL joined #git
18:24 mizu_no_oto joined #git
18:26 fiveflowerzz joined #git
18:26 fiveflowerzz Hi!
18:26 fiveflowerzz Imagine I have a local repo, and that I want to test a pull request by someone else.
18:26 fiveflowerzz I thought about doing:
18:26 fiveflowerzz git checkout -b theguywhodidpr-test
18:27 fiveflowerzz git pull https://github.com/theguywhodidpr/myproject.git
18:27 fiveflowerzz then I can test his version. Is this correct?
18:27 skyres joined #git
18:27 A5101 joined #git
18:28 NwS joined #git
18:28 jluc left #git
18:29 Vangelis joined #git
18:29 mischat joined #git
18:30 cbreak joined #git
18:30 _ikke_ You need to checkout the correct branch
18:30 fiveflowerzz _ikke_ what do you mean?
18:31 _ikke_ The PR was probably made in a feature branch
18:32 fiveflowerzz you mean in the his branch isn't named "master" ?
18:32 nwkj86 joined #git
18:32 fiveflowerzz *in the case
18:33 fiveflowerzz how to do it in this case?
18:33 raspado joined #git
18:34 fiveflowerzz imagine his branch is named "feature1" , and let's say i already have a "feature1" branch locally!
18:34 skyres joined #git
18:34 fiveflowerzz how to do that?
18:35 danslo joined #git
18:35 _ikke_ fiveflowerzz: git remote add theguywhodidpr https://github.com/theguywhodidpr/myproject.git
18:35 _ikke_ git fetch theguywhodidpr
18:35 _ikke_ git checkout feature1
18:35 _ikke_ git merge theguywhodidpr/feature1
18:36 danslo joined #git
18:36 danslo joined #git
18:38 multiproc joined #git
18:40 skyres joined #git
18:41 lordjancso_ joined #git
18:41 blackwind_123 joined #git
18:43 xocket joined #git
18:43 JamesBaxter joined #git
18:44 skunkz joined #git
18:46 israelzuniga joined #git
18:46 skyres joined #git
18:47 davimore joined #git
18:47 phanimah1sh joined #git
18:48 solrize joined #git
18:48 solrize joined #git
18:50 jimi_ joined #git
18:50 byte512 joined #git
18:51 mrpackethead joined #git
18:53 skyres joined #git
18:53 venmx joined #git
18:54 meauses joined #git
18:55 ayjay_t joined #git
18:56 satifant joined #git
18:59 skyres joined #git
19:06 nicksloan joined #git
19:06 skyres joined #git
19:08 meauses joined #git
19:08 thebope joined #git
19:09 det joined #git
19:09 courrier joined #git
19:09 Guest22943 joined #git
19:09 Guest22943 joined #git
19:09 manuels joined #git
19:12 Eugene jast / cbreak - if RAID is your only protection, then you don't care about data loss anyway ;-)
19:12 skyres joined #git
19:13 cbreak Eugene: it's the second line of defense
19:13 cbreak maybe the third
19:13 Eugene A good backup(and restore!) strategy is the first.
19:13 Koopz joined #git
19:14 _ikke_ I think RAID would be the first
19:14 _ikke_ If a disk breaks, you can still continue
19:14 cbreak Error Correcting Codes in hard disks / ssds are the first
19:14 _ikke_ right
19:14 cbreak raid is the second
19:15 cbreak backups on the nas are the third
19:15 cbreak remote backups the fourth
19:15 cbreak and redownloading from piratebay the fifth
19:15 cbreak I mean ... linuxisos.org
19:16 Eugene I think about failures of entire systems, not just bits. RAID saves you losing a disk, but there's lots more that can(and will) go wrong with your system. The whole thing is moot if you don't have a way to get your data back from somewhere other than "local"
19:17 Eugene Being able to recover from a worst-case-scenario(loss of your entire site due to fire, for example) automagically means you're protected against lesser disasters
19:17 Eugene Anything more than that is just a convenience so you can bring things back quicker
19:17 _ikke_ Until you found out the backup didn't work
19:18 Zarthus backups not working? that will never happen to me!
19:18 Eugene And that's why you automate+monitor right out of the gate.
19:19 skyres joined #git
19:19 Eugene Most $5/mo backup services support email notifications for non-backed-up systems, and restoration tests are as simple as clicking Download.
19:19 Zarthus most providers ship with backing up support out of the box for a tad extra
19:20 Eugene </soapbox>
19:20 _ikke_ We take back-ups very seriously here, but we almost lost data because both the on-tape and remote backups fell behind
19:21 _ikke_ (system that gets lots of new data)
19:21 Zarthus our work doesn't take backups too serious, but I also don't really care because the project I'm getting paid for isn't particularily ethical
19:21 Zarthus or well-built, for that matter.
19:21 Eugene Did you fix your monitoring script? ;-)
19:22 _ikke_ We have people daily checking the back-ups
19:22 arnaud__ joined #git
19:22 _ikke_ It's not necessarily that we weren't aware
19:23 Eugene Ew, human interaction
19:23 Zarthus humans checking up on backups is a good thing
19:23 Zarthus machines can fail, but only humans can be blamed
19:23 Eugene Humans double-checking is good; humans as the only check is bad
19:24 mischat joined #git
19:24 mischat joined #git
19:25 cdg joined #git
19:25 Cxcf Is there a way of displaying alternate calendar layouts, like ncal? I can't find anything in *Customize*
19:25 _ikke_ calendar layouts?
19:25 skyres joined #git
19:25 cdg joined #git
19:25 testX joined #git
19:27 Cxcf _ikke_: so when you 'cal' in the cli, you get a layout similar to M-x calendar. If you 'ncal' in the cli, you get an alternate layout. I'm trying to get that in emacs
19:27 _ikke_ you know this is #git, right?
19:27 Cxcf _ikke_: damnit, thanks. Sorry for that
19:27 _ikke_ np
19:28 madebymarkca joined #git
19:28 Eugene Have you tried turning it off and back on again
19:30 MarceColl joined #git
19:31 Doginal joined #git
19:32 skyres joined #git
19:32 nidr0x joined #git
19:33 amfc joined #git
19:33 cyan__ joined #git
19:35 vuoto joined #git
19:36 * Seveas turns Eugene off
19:38 danslo joined #git
19:38 skyres joined #git
19:39 mischat joined #git
19:40 amfc hi! any tips to reduce git cpu usage? we're using git to develop out big app (3M lines, 10 years of history) and distribute it to our ~900 worker test system. it's really consuming a lot of cpu and ocassionally if there's a biggish change it will out pool of git mirrors slow to a crawl. just downloading a bit of data is almost as slow as cloning the whole repo again
19:40 amfc we have repacked and enabled bitmap indexes, but it made very little change
19:41 madewokherd joined #git
19:43 arnaud__ joined #git
19:43 xock_stream joined #git
19:44 storrgie joined #git
19:44 skyres joined #git
19:45 storrgie It seems common to have all repos be owned by the 'git' user on the remote system. Is it possible to set permissions by repo? I'd assume I'd have to have multiple remote users and then use normal group permissions to achieve this.
19:46 _ikke_ It is possible, git has a shared config setting which makes git set specific permissions
19:48 fiveflowerzz _ikke_ Thanks, I hadn't seen it before, I'm reading it now!
19:48 fiveflowerzz In the meantime I had posted http://stackoverflow.com/q/40578093/1422096
19:48 fiveflowerzz If you have an idea, I think it would be useful ;) (I asked some friends who use git but they didn't know how to do it in this specific case...)
19:51 skyres joined #git
19:51 Eugene amfc - generically, 'have a smaller repo'. You can do this by splitting up your project into smaller component parts(use submodules to glue it back together if you have a super/subproject pattern, or just treat it as separate projects entirely), have less history(you don't "need" 10 years of converted SVN; just leave an archive server somewhere), and not committing large binary blob files
19:51 jstimm joined #git
19:52 Eugene storrgie - `git` is just the default username created by some packagers for the git-daemon. We generally recommend using an ACL layer like !gitolite and a dedicated user that owns all the repos on-disk
19:52 gitinfo storrgie: Gitolite is a tool to host git repos on a server. It features fine-grained access control, custom hooks, and can be installed without root. Download: https://github.com/sitaramc/gitolite Docs: http://gitolite.com/gitolite/
19:52 Eugene You can do group-based sharing(man git-config and see... core.shared I think?), but "use gitolite" is the end-game answer
19:52 gitinfo the git-config manpage is available at http://jk.gs/git-config.html
19:54 sea-gull joined #git
19:57 skyres joined #git
19:59 Siegfried joined #git
19:59 dodobrain joined #git
20:03 skyres joined #git
20:04 flavius joined #git
20:05 jstimm joined #git
20:05 aidalgol joined #git
20:07 robotroll joined #git
20:09 pbrewczynski joined #git
20:10 skyres joined #git
20:12 ||JD|| joined #git
20:13 Noldorin joined #git
20:13 Muzer joined #git
20:15 eivarv joined #git
20:15 jaguarmagenta joined #git
20:16 skyres joined #git
20:16 eivarv_ joined #git
20:19 HoierM joined #git
20:20 ash_workz joined #git
20:22 skyres joined #git
20:24 Shakeel_ joined #git
20:25 amfc Eugene, I just noticed that using git archive is much faster
20:25 amfc Eugene, ~3s compared to ~30s
20:25 amfc which is weird, but I think the git protocol is not very optimized for pulling many small changes
20:25 amfc Eugene, I'll make the system use git archive + caching
20:26 Rodya_ joined #git
20:28 kesslerfrost joined #git
20:29 skyres joined #git
20:29 danslo joined #git
20:31 danslo joined #git
20:34 solrize joined #git
20:35 skyres joined #git
20:35 FunkyAss joined #git
20:36 WayToDoor joined #git
20:38 raijin joined #git
20:38 Zamerick joined #git
20:38 sea-gull joined #git
20:38 DieguezZ joined #git
20:39 Rodya_ joined #git
20:42 skyres joined #git
20:44 xocket joined #git
20:47 mischat joined #git
20:47 Zamerick joined #git
20:49 bket joined #git
20:49 Limes_ joined #git
20:52 jon-mac joined #git
20:52 clemf joined #git
20:53 shaggycat joined #git
20:55 elastix joined #git
20:56 Eugene amfc - archive just vomits a tarball without doing very much; clone/fetch operations requrr walking a lot of objects to check for validity. Less history helps
20:58 mischat joined #git
20:59 pks joined #git
20:59 moei joined #git
21:01 jstimm joined #git
21:01 z3t0 joined #git
21:02 z3t0 Hi all, I was wondering at which point would it be better to clone a repo instead of forking it?
21:02 enckse joined #git
21:05 storrgie joined #git
21:06 Eugene Do you mean the Fork button on github?
21:06 Zarthus z3t0: pretty much when you don't intend to make any changes to it
21:06 romerocesar joined #git
21:07 Ender13 joined #git
21:11 jstimm joined #git
21:11 z3t0 Eugene: correct
21:12 z3t0 Zarthus: I thought the idea was to fork and submit changes there because only contributors can commit upstream on the main repo?
21:13 Zarthus think of cases where you just want to compile and install software, that's where git-clone is sufficient
21:13 Eugene A github Fork is a copy of the repo under your account, which you can write to. A clone is a local(to your desktop) copy of a repo. Normally you work locally, commit, push to your Fork, and lastly create a Pull Request to have your changes merged back upstream
21:14 Eugene If you don't have anything to contribute you would just clone and use it locally
21:14 z3t0 Eugene: ah I see
21:15 z3t0 the reason i ask is that usually when i fork and want to contribute I end up just recreating the repository without a fork after a while when i decide that my fork has pretty much started to go in its own direction
21:15 Eugene You can just do that and ignore the forked from property
21:15 Zarthus that's fine too, it comes at the condition of no longer being able to (easily) sync with upstream as well as you having to maintain it
21:17 Eugene The fork mechanism is really just for PRs. There's nothing shared between repos on github's side
21:18 jimi_ joined #git
21:19 Zarthus fork is the crippled brother of the main repository. It mostly loses features.
21:21 Sonderblade joined #git
21:25 xocket joined #git
21:26 [twisti] left #git
21:27 cdown joined #git
21:28 tcurdt joined #git
21:29 infernix joined #git
21:30 z3t0 Zarthus: yeah i hate that about it, losing features makes it really annoying
21:30 Zarthus z3t0: just convert it to a normal repo
21:30 z3t0 well for the repo in question at the moment im just hoping to be made an official contributor so i can have write access to the main repo
21:31 Zarthus depending on the repo, some people are okay with people just submitting a lot of pull requests
21:31 z3t0 i dont really need to write directly to master, just that its nice to be able to manage things like issues directly
21:31 Zarthus you already sort-of can.
21:31 z3t0 Zarthus: tbh i prefer the PR workflow as it makes the review process much more inherent
21:31 Zarthus Putting "Closes #id" in your commit message closes it up on merge
21:31 z3t0 Zarthus: but what about things like labelling/closing issues, or creating "Projects"
21:32 Zarthus can't do those, yeah. Some people are more precise in their tagging than others.
21:32 Zarthus aside from by being social and asking for it, not much you can do.
21:33 astrofog joined #git
21:34 z3t0 Zarthus: haha yep, my plan is to just commit a ton of stuff so that i essentially become a major contributor
21:34 cdown joined #git
21:35 aard_ joined #git
21:36 Eugene Uh, you can do anything you want in your Fork?
21:36 Eugene There's issues, wiki, etc just fine
21:37 z3t0 not that I can see.?
21:37 z3t0 https://i.imgur.com/yconIgq.png
21:37 Eugene The parent repo will have its own privacy settings, but if you're forking it that doesn't matter at all
21:37 courrier joined #git
21:37 Eugene Did you turn it on under Settings?
21:37 z3t0 well the Projects is there my bad
21:37 z3t0 oh...
21:37 z3t0 OHH
21:37 z3t0 I did not see that before haha thanks eb0t
21:37 z3t0 Eugene **
21:37 z3t0 sorry autocomplete.....
21:37 Eugene !next
21:37 gitinfo Another satisfied customer. NEXT!
21:38 cyan__ joined #git
21:38 bmahe joined #git
21:43 cdg_ joined #git
21:45 adac joined #git
21:48 z3t0 how do i report a scam bot on an irc channel?
21:49 z3t0 Derperperd: pls stop
21:49 Derperperd what z3t0
21:50 z3t0 Derperperd: I got a message from you about some nigerian inheritance bs?
21:50 Derperperd LOL what the fuck
21:50 z3t0 lol maybe someones impersonatiing you.. im so confused now haha
21:50 z3t0 https://i.imgur.com/zrRXtQR.png
21:52 Derperperd joined #git
21:54 Derperperd z3t0: what the actual fuck
21:54 z3t0 yeah no idea... Derperperd. just to be clear its not you?
21:54 Derperperd no its not me.....
21:54 qsx Derperperd: either you are lying, or your system is somehow infected
21:54 Derperperd im assuming i got hacked?
21:54 qsx whichever it is, please get it fixed.
21:54 Derperperd changing my password now. brb
21:55 z3t0 heres what i get when i whois the other person
21:55 z3t0 https://i.imgur.com/DrCvz5M.png
21:55 Derperperd joined #git
21:56 Derperperd hopefully that fixed it
21:56 achlys joined #git
21:57 echilon joined #git
21:58 skunkz joined #git
21:58 z3t0 hopefully yep
21:59 Derperperd i got your messages z3t0
22:00 z3t0 oh hmm that is really wierd because i was trying to reply to the initial scam messages... Derperperd
22:00 pigeon joined #git
22:00 z3t0 hopefull changing your password did something
22:00 Derperperd yeah idk wtf just happened
22:00 Derperperd thanks for letting me know
22:02 jf_ joined #git
22:03 echilon joined #git
22:03 ArchNoob joined #git
22:04 echilon_ joined #git
22:05 visionquest joined #git
22:07 jf_ Hi everyone. I just discovered git-p4.py in git distribution. Any user around? I'm trying to perform the "git p4 submit" but I would like it not to pop up an editor before actually submitting. "p4 submit" has a -d option to submit a commit without requesting the input of the user but git-p4 doesn't have something like that.
22:08 Noldorin why does `git submodule summary` display nothing even though I clearly have submodules???
22:08 mischat joined #git
22:08 Random832 z3t0: well it doesn't keep track of anything except the name - if the scammer quit and then he signed on your whois and the replies would have gone to him
22:09 Random832 it tracks nick changes but if the scammer just quit it wouldn't know it's a different person
22:09 kpease joined #git
22:11 echelon_ joined #git
22:11 echelon_ left #git
22:11 anonymuse joined #git
22:12 echelon_ joined #git
22:12 GreyFaceNoSpace joined #git
22:13 echelon_ left #git
22:17 Rodya_ joined #git
22:17 inflames joined #git
22:19 anonzadas joined #git
22:19 fiveflowerzz joined #git
22:19 fiveflowerzz Hi!
22:19 fiveflowerzz I know that git checkout -b hello  is a shorthand for git branch hello; git checkout hello
22:20 fiveflowerzz but what is "git checkout -b hello hello2" ?
22:21 imMute git branch hello hello2
22:21 FunkyAss man git checkout says "git checkout -b|-B <new_branch> [<start point>]
22:21 gitinfo the git-checkout manpage is available at http://jk.gs/git-checkout.html
22:21 imMute starts a branch somewhere other than HEAD
22:27 fiveflowerzz thanks
22:28 jf_ is "public-access television programming" in the title an inside joke? :-)
22:29 cdg joined #git
22:32 Lyqyd joined #git
22:34 xaa__ joined #git
22:34 theskill_ joined #git
22:36 DieguezZ joined #git
22:37 Noldorin anyone?
22:39 jf_ noldorin; sorry, I don't know much about submodules
22:39 Noldorin no worries.
22:39 drmt joined #git
22:40 ArchNoob joined #git
22:41 cbreak Noldorin: you sure you have submodules?
22:41 cbreak i.e. did you initialize / clone them?
22:41 Noldorin cbreak, very. I have a .gitsubmodules file in the root.
22:41 Noldorin yeah
22:41 Noldorin I did.
22:41 cbreak so you did a git clone --recursive or git submodule updatea --init or similar?
22:41 cbreak hmm...
22:41 cbreak then they are up to date and probably don't show
22:41 qqx joined #git
22:41 cbreak you can change one of them, if they still don't show afterwards it'd be weird
22:42 Noldorin err a ".gitmodules" file I mean
22:42 Noldorin cbreak, well I checkout out a new branch by doing "git pull" then "git co newbranch"
22:42 cbreak in the submodule?
22:43 Noldorin cbreak, nope
22:43 Noldorin cbreak, the submodule dirs don't even exist
22:43 cbreak then you didn't init them
22:43 cbreak git submodule update --init
22:45 Noldorin I did
22:45 Noldorin tried that
22:45 Noldorin no luck
22:45 Noldorin Oh wait, now I'm getting fatal: No url found for submodule path 'librocksdb-sys/rocksdb' in .gitmodules
22:47 JanC_ joined #git
22:47 Noldorin hmm
22:48 ISmithers joined #git
22:48 DieguezZ joined #git
22:48 razieliyo joined #git
22:48 razieliyo hi
22:48 cbreak how did you clone the outer repo?
22:50 razieliyo I have several repositories with one-file-projects, they are small utilities I use every now and then, and now I'm thinking that it would be better to have all of them in a single repository; I would like to merge all these one-file projects into one and delete the separated ones; are subtrees the way to go? I guess submodules aren't because I plan to remove old repositories
22:51 cbreak indeed
22:51 cbreak or you can just merge them normally
22:52 razieliyo cbreak, merge them normally, hmmm, like merging all repositories into one, I thought of that, but didn't know if that would be possible because of the completely separated history
22:52 multiproc joined #git
22:54 razieliyo bad thing is all these repositories are local only, I mean, a plain "mkdir folder; git init", idk if I need a bare repository in order to merge or I can merge somehow indicating the folder
22:56 razieliyo oh wait, urls can be a relative local folder? nice!
22:56 razieliyo years using git and didn't know about this
22:57 razieliyo cbreak, thanks, that works nicely, I don't need to use subtrees
22:58 israelzuniga joined #git
22:59 multi_io_ left #git
23:00 cdg_ joined #git
23:01 razieliyo --allow-unrelated-histories was the key, taken from http://stackoverflow.com/questions/14258​92/how-do-you-merge-two-git-repositories
23:02 ybden joined #git
23:05 cbreak didn't know that existed. Must be new :)
23:12 GT joined #git
23:12 duckinja joined #git
23:13 clemf joined #git
23:14 peeps[lappy] joined #git
23:16 crater2150 joined #git
23:21 alex1a joined #git
23:22 rvolosatovs joined #git
23:23 cagedwisdom joined #git
23:25 overlord_tm joined #git
23:26 overlord_tm joined #git
23:33 aidalgol joined #git
23:34 diogenese joined #git
23:35 dan2k3k4 joined #git
23:36 ArchNoob joined #git
23:36 cyphase joined #git
23:37 justan0theruser joined #git
23:37 romerocesar joined #git
23:40 romerocesar joined #git
23:41 whitby joined #git
23:44 Rodya_ joined #git
23:47 nettoweb joined #git
23:51 nettoweb joined #git
23:52 snthsnth joined #git
23:55 Rodya_ joined #git
23:56 ToBeCloud joined #git

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