#pocoo

/

      • eka joined the channel
      • ivandeex has quit
      • ivandeex joined the channel
      • shiranaihito joined the channel
      • jrm2k6 joined the channel
      • Not-f7bb
        [02pygments-main] 07tshatch pushed 035 commits to 03default [+1/-0/±2] 13https://bitbucket.org/birkenfeld/pygments-mai...
      • [02pygments-main] 07Valentin Lorentz <progval@progval.net>; 03667528f - Add support for function keywords in C/C++.
      • [02pygments-main] 07Valentin Lorentz <progval@progval.net>; 03ba85c11 - Fix previous commit
      • [02pygments-main] 07Valentin Lorentz <progval@progval.net>; 03685c7e8 - Fix previous commit (again)
      • [02pygments-main] 07Tim Hatch <tim@timhatch.com>; 03968d816 - Add tests for function keywords
      • [02pygments-main] 07Tim Hatch <tim@timhatch.com>; 035a85bf7 - Merged in ProgVal/pygments-main/c-function-keywords (pull request #487)
      • aimi joined the channel
      • jotabe joined the channel
      • [02pygments-main] 07tshatch pushed 031 commit to 03default [+0/-0/±1] 13https://bitbucket.org/birkenfeld/pygments-mai...
      • [02pygments-main] 07Tim Hatch <tim@timhatch.com>; 0373115a2 - Unbreak NesC after PR#487 merge.
      • mistermocha joined the channel
      • jotabe has quit
      • mistermocha has quit
      • jrm2k6 has quit
      • ajacmac joined the channel
      • pingpong1109 has quit
      • pingpong1109 joined the channel
      • totallyserious has quit
      • totallyserious joined the channel
      • sledov joined the channel
      • pingpong1127 joined the channel
      • traut has quit
      • rafaelmartins has quit
      • tachyondecay joined the channel
      • F2Knight joined the channel
      • davidism has quit
      • rafaelmartins joined the channel
      • Earchcraft has quit
      • Hairy joined the channel
      • microdex joined the channel
      • microdex has quit
      • pingpong1109 has quit
      • pingpong1109 joined the channel
      • rafaelmartins has quit
      • szt has quit
      • szt joined the channel
      • rafaelmartins joined the channel
      • ajacmac has quit
      • jotabe joined the channel
      • pingpong1109 has quit
      • pingpong1109 joined the channel
      • jotabe has quit
      • F2Knight has quit
      • totallyserious has quit
      • mistermocha joined the channel
      • mistermocha has quit
      • notdaniel joined the channel
      • totallyserious joined the channel
      • abdolhosein joined the channel
      • knikolov joined the channel
      • geetar1 has quit
      • microdex joined the channel
      • Earchcraft joined the channel
      • microdex has quit
      • abdolhosein has quit
      • rafaelmartins has quit
      • abdolhosein joined the channel
      • rafaelmartins joined the channel
      • geetar1 joined the channel
      • noobsrus joined the channel
      • kerozene has quit
      • noobsrus
        guys got a noob git question
      • when i initialize a git repo off say github or bitbucket is that new repo a bare repo?
      • do ppl normally use bare repos?
      • i run git remote add origin yadayada.git
      • on local
      • which sets remote to the server
      • abdolhosein has quit
      • tachyondecay
        Did you clone the repo from the remote repo, or did you init the new repo and then add a remote?
      • The answer to your question in either case is "no," simply because a bare repo has a specific definition.
      • kerozene joined the channel
      • noobsrus
        hmm so do ppl actully use bare repos out in the wild?
      • bkc_
        yes
      • tachyondecay
        Bare repo means no working tree
      • bkc_
        a 'bare' repo is a repo where the code isn't checked out locally
      • noobsrus
        so basically when ur in a bare repo you can't do any commits
      • pushes or pull
      • right?
      • tachyondecay
        You need to explicitly set the --bare flag when initing the repo
      • Yes
      • bkc_
        IIRC you can push/pull form a bare repo, but not w/o some magic
      • tachyondecay
        A repo in GitHub is an example of a bare repo, at least in concept if not in practice
      • noobsrus
        so setting remote origin just sets up a server to take my repo but that remote origin doesn't necessarily have to be bare?
      • tachyondecay
        I use bare repos on my production server as centralized repos for my websites.
      • bkc_
        ^
      • noobsrus: it has to be there
      • tachyondecay
        If you try to push to a remote that has a working copy, you will get an error
      • bkc_
        you can push to a normal (non-bare) git-repo, but any changes in there will make it error out
      • tachyondecay
        That's why if you're not using a centralized model for your development, you need to do only pull requests instead of "pushing"
      • A pull request literally meaning you email someone and say "pull this from my repo"
      • GitHub has just fancified it.
      • noobsrus
        so the main remote in a github project is by def not bare
      • bare repos are used when you want a centralized source of truth?
      • tachyondecay
        That's one purpose, sure
      • Not sure what you mean by the first statement
      • Good for backups too :)
      • noobsrus
        if i just follow standard instructions to create a repo on github that remote origin server isn't bare by default
      • bkc_
        the repo ON github is a bare repo, what you clone/checkout isn't
      • (unless you do `git clone --bare`
      • )
      • noobsrus
        ahh
      • bkc_
        whether it's bare or not is local to every clone
      • noobsrus
        so remote origins are generally bare? they're just dumb containers used to store
      • yup
      • bkc_
        usually yes
      • noobsrus
        unless you explicitly clone bare your local isnt bare
      • mkoskar has quit
      • bkc_
        since pushing to a working copy is teadious (can be fixed with git-hooks, but please don't)
      • indeed
      • tachyondecay
        ^^
      • Yeah, generally when you clone a repo it's assumed you want to check out a working copy of the HEAD commit.
      • bkc_
        ^
      • noobsrus
        sorry for being dense guys
      • tachyondecay
        No worries.
      • bkc_
        heh, I'd prob read this one :) https://git-scm.com/book/en/v2
      • noobsrus
        ill read it
      • bkc_
        you can probably just skim through the "technical" parts (read the headers though, so you'll remember where to look when you fuck up ;)
      • though I recommend reading it all :)
      • noobsrus
        ill go through it all
      • bkc_
        #4 is "pointless" unless you're setting up your own server (or backup usb-key ^.^)
      • noobsrus
        so in a centralized workflow everyone w/ perms will only push prod quality stuff to a master branch
      • bkc_
        nah, not usually :)
      • tachyondecay
        I love the Git book :)
      • bkc_
      • tachyondecay: indeed ^.^
      • tachyondecay
        noobsrus: You can do whatever you want, but the most important thing is to lay down explicit rules/procedures and then follow them.
      • The only "wrong" way to do things is to do "whatever" and hope it works out.
      • bkc_
        ^ +10^10000
      • (well, 10**10000 in python lingo ^:^)
      • noobsrus
        tachyondecay i just wanna figure out the canonical or standard way of doing it and stick to that lol
      • bkc_
        nvie git-flow is the one I find most used
      • tachyondecay
        There is no "canonical" way. Git-Flow has become very popular. I personally find it a little heavy for smaller projects/groups, but you might not.
      • Pick one that works for you, and go with it. If you take something like Git-Flow, but with modifications, just spell those out in your documentation.
      • bkc_
        it is indeed quite heavy, but it's neat and clean ^.^
      • tachyondecay
        True.
      • I guess that's kind of like BEM in CSS, which I’m trying to adopt because my CSS is a mess.
      • bkc_
        GitLab Flow is more centered about everything being a MR (GitLab for Merge Request, because fuck using standard technical terms...)
      • tachyondecay
        :D
      • bkc_
        while nvie allows directly merging to master
      • though GLFlow seems more layed out for larger orgs
      • WRT GitLab calling it MR, I actually get why they named it MR instead of PR, but still...
      • microdex joined the channel
      • tachyondecay
        noobsrus: If you dig down too deep into "the right way"/"best practices" you're also going to start running into holy wars
      • Like rebasing vs merging and whatnot