GitHub Git Merge 2016, 16 Nov 2016

Previous Meeting

Next Meeting

⏯

youtube image

►

From YouTube: 20 Tricks with Git and Shell, Spencer Krum - Git Merge 2016

Description

Learn about a number of neat tricks used on the command line to make git experiences more straightforward. Most of these tricks compose the standard unix utilities. Only one or two require any packages outside of the standard set. At least one of these tricks will wow you so much that you’ll add it to your .bashrc on the spot. Discover the patterns used construct these small utilities and you will start creating and using your own.

Spencer Krum (http://spencerkrum.com) has been sysoping Linux since 2010. He works for IBM contributing upstream to OpenStack and Puppet. Spencer is a core contributor to the OpenStack Infrastructure Project.

About Git Merge:
Git Merge is the pre-eminent Git-focused conference: a full-day offering technical content, user case studies and training workshops for Git users of all levels.

Visit: http://git-merge.com/

A

Hello, everybody, my name is Spencer Chrome I'm from Portland, it's great to be in New York, thanks to get out for putting it on and think, I'm really pleased that we're supporting the software freedom, Conservancy they're, a fantastic organization. Okay, so this talk is, is really not ten minutes long, so we're gonna go through pretty quickly, so this is kind of my. This is sort of a.

A

How do I do things talk so I spend a lot of time in the shell and I think that as a as a computing as computing has gone forward, and we all got MacBooks and stuff, we kind of stopped doing as much with the shell, and so this is kind of some some dumb shell tricks that I used especially around get that. Hopefully you can take home and use too so there's some bash aliases. There's some bash functions, there's some dumb little scripts, and maybe they can make you a little bit more efficient.

A

Ideally you would I want you to take it's actually the patterns that I'm gonna use and not not specifically these lines of code. But if you end up taking these lines of codes, that's fine. This is the github where all that stuff is- or at least it will be later today.

A

Okay, so I'm a bad typist, so I'll, just alias stuff, so bash, alias basically works like the stuff on the Left equals the stuff on the right, so I can't type make derp I can't type source, so just whatever I also don't like to type very much so I'm, not gonna type. All of get out that just introduces the opportunities for problems.

A

I'm, not gonna type, git push origin master because I can type GP om or Chiho RM. These things are just I. Don't have time for that. I'll also screw up the origin. Space master, an Origin, slash master, so it adds consistency to with it bash alias you can override a command that already exists, so you probably already have the middle one in your bachelor C already, but that is just a Linux program that will open up image, but it opens it zoomed and I want it to be full screen.

A

So I, just every time, I run fat, its fed ash cap F. You can also see how UTC date is a new command that we've created using an alias that gives us the time in in UTC which your service should all be in. Unless your system, administrators are bad, hi, doc, I think I stole PI doc from someone, but basically just you run PI doc JSON and it opens up the JSON Python documentation and less, which is all you really wanted. Em shuffle will just pick which episode of next generation I'm watching today.

A

This is I'm going to lunch and it's time for things to be on the server. So just be s commit and what's meant to demonstrate is you can put a semicolon in an alias, so you could go just totally nuts I, don't know the alphabet, so I have a command that will dump the alphabet and I have a command that will dump the alphabet with numbers. So I can see that K is the 11th letter and I need Unicode, Snowman available and I need the ASCII table so yeah.

A

So man ASCII will just give you the ASCII table, but that one will like take it out of man and dump it into a table that doesn't in any way you can put environment variables inside aliases and make new commands that way. So there you could see an example of UTC day by just setting the TZ variable or the up one above it. So typically, my opus tected org is not in my DNS search scope, but when I type ossh server it will go to server OpenStack org.

A

This is a little bit experimental, but you can put reg X's, basically in aliases and then like kind of get them out on the other side and kind of grep, for something that looks like a mac addresses pretty cool, so I'm, an Operations engineer by trade and so I write a lot of files in the amylin JSON, and it really sucks to wait.

A

15 minutes for tests to find out that, like I fought the long, the trailing comma in JSON and so I don't have valid JSON, so I have three lines: I have yam will check in JSON check in puppet parts to validate that will basically just validate that a file is valid, JSON or Gamal or whatever, and this saves me a lot of time. I don't have any time to explain to you how this works, but what you should do is basically get it to the point where you can dynamically control.

A

What your prompt does so I can turn on get tracking in my prompts I can turn it off. I can turn on file tracking, and my prompts I can turn it off. I could turn on our VM. I can turn it off. It's really useful, um classic get config stuff. It wouldn't be fair to have it in there. I still can't spell so alias girp equals graph, especially if you're new, to get these three aliases in the middle are gonna.

A

Save you a lot of time, I think probably most people have them, but they're, very, very good unless you're on CentOS, in which case that top one is stupid, there's also some stuff here for like if you have sub modules- and this kind of neatly shows it's been showed today. But if you want to make an alias that has semicolons or more complicated bash isms in it. You need to do this. This strange behavior of death of creativity and calling it I didn't make this up.

A

I stole this from somebody they're linked here, but if you put this stuff and then a couple other things in your dot files, when you type git diff- and there was an image, it will pop up three windows with the original image, the like the new image and then like a weird transparency with pixels filled in for where the image changed, which is pretty sweet and it doesn't screenshot very well. So you don't get to see it so bash function, so bash functions. Just kind of look like that.

A

You just kind of write that in your bash or C or whatever, and it's like our little script that you had so this was I, was working on a book and I needed to SSH tunnel in our desktop through that. So it was just a little one-liner. Instead of running those two commands in two separate windows, this is actually really good.

A

So you're you're like five directories: deep and a git repo and you're like scared, and you just I just want to go home, and so what CDP will do is it will take you up to home and then you can run get status. You can run a rebase without running into any directories that don't exist any of that stuff. It's it's it's good. This is also really useful. That's probably the other useful thing in the talk. It's just magic.

A

So if someone says hey, will you check out PR 17, so you CD to the directory that has that git repo and you type PR 17 and it pulls down github pull request, number 17 and then you can run the tests. You can look at the code, you can actually branch from there and go somewhere else, but and it's it's done through some magic. It's just some like refs that exist in github I. Don't really like going to the web browser.

A

If I can stay on the command line, so I you wrapped, get hubs hub utility and created, get fork and get pull request so that I can just commit fork. Push and then pull request all from the command line and pull request spits out a URL that I can just like paste into chat or whatever so in bash functions. You can also override commands that already exist, but in a function you have a lot more control of what you do.

A

So seedy record is just record the CD and Linux, but it doesn't eject at the end and I think that a CD birding program should eject when it's done, and so it just yeah. It just runs CD record and then ejects at the end and that's kind of useful I work on OpenStack. So there should be some OpenStack in the talk. So designate is the DNS part of OpenStack and if you want to know all the domains that you've you've set, you have to type that gross thing and I.

A

Just I put it in an alias because I didn't want to deal with it, and so aliases actually move out of just convenient commands and into holding data. For me that I don't want to keep in my head same with clean flow. Okay, so I use Garrett Garrett is a git server, that's written in Java, it's from Google and I. Think a lot of people probably use it, but maybe not this crowd.

A

This is kind of the github crowd, and so basically, when you want to make a pull request, you actually make something called a review, and so at some point in your life we found out. If you work with Garrett, you write a tool called git review, so we wrote this get review in 2011 and then, like last year, sometime the go coders for golang, we're like we made a new tool called git review and we're like hi.

A

That's not good. We're conflicting names, they're like oh woops, are bad, and so now they have good code review and they're ready to go alright. So Garrett also has this weird SSH API, so you SSH into it on the Left C and then on the right. You type Garrett H, and it's and it gives you this help output cuz! It's it's like it's like a command-line utility like over SSH.

A

There's no shell involved because it's Java, but don't worry about it too much and so I decided that was that was annoying, so I wrote a little function that just kind of wraps it and then that dollar star on the end basically means everything. I pass to Garrett goes into. This function goes into the SSH.

A

Anything comes out, the other side so I can ban, commit, I can create commit, I can I can do whatever I need to do, and then I went a little bit further and I started, defining like basically inspect the first arguments of the function and decide if it's whip and if its whip I take my own action. So I've added arguments, I've added sub commands to this Garrett thing: that's actually on a remote server entirely with local configuration, which is a little weird all right.

A

So if you type them plus 24 and then filename does anyone know what happens?

A

It opens it to line 24 and if you type that history line it actually gives you the last command that you wrote and if you type you know just get grep and you have some config file set. You get that : 75 : output.

A

Maybe people see where I'm going with this, and so my vim command has been overloaded. So it inspects my last command history and if the last command that I typed was get grep and I just clicked paste in that change, log :, 75 : it looks and like oh I, should strip that number out and then call them with plus 75 on that file and just opens with him directly to the thing that I just crept for, which is maybe maybe I shouldn't, have done that. But I did um so.

A

This has been stupid, git tricks, my name is Spencer Crum I'm live eliezer on IRC and everywhere, thanks for coming and thanks for supporting the software freedom Conservancy.