vStone BlogMain menuSkip to contentAbout Me / ContactActivityProjectsTalksGitHub pull requests as seen by GIT2014/05/06First off, some links to github documentation:GitHub: Using pull requests (the clickety-click way)GitHub: Checking out pull requests (The GIT way)For just working with pull requests and even manually fetching / merging pull requests locally this information is more than enough. I found that by adding a new refspec, my branches are getting polluted with a looooong list of pull requests for certain projects. I would rather have a simple quick execute-once way of doing the same thing.An extremely simple way is by adding a new alias:git config alias.fpr '!sh -c "git fetch origin pull/${1}/head:pr/${1}" -'This allows you to use git fpr 696 to pull in #696. Mind you, the remote is hardcoded to ‘origin‘ here.In some cases, I’m really inpatient towards pull requests on upstream repositories and I want to merge them in my local repository more easily.I created the following script for just that: git-merge-pr.sh.A quick example:$ ./git-merge-pr.sh 696$ git log -n1commit c0f62a0b1ed09ce928d35a90854a1eb2c2ac6d10Merge: 1d837ed 54988e1Author: Jan Vansteenkiste Date:   Tue May 6 06:48:43 2014 +0200Merged pull request: #696: Bugfix/debian control file permissionsSee jordansissel/fpm#696 for more information* pr/696:Ignore lsb init scripts warning since we are not providing a proper init script for testingFeeling brave, enable lintian for travisFix file permissions on deb control filesConflicts:.travis.ymlPosted in Uncategorized| ReplyDiffing gems in GIT.2014/05/01Recently, I’ve been doing some patching on fpm and today I also started writing some tests for the changes I made. One change required that the gem in the repository used for testing had a bin in it so I modified the .gemspec and rebuild it.After building and about to push it, I thought on how it must seem to the maintainer when somebody sends a pull request for a binary blob. I would like to know what really changed in there without having to go checkout the internals myself. How wonderful would life be if we could just use git diff to show the differences.Here is a way to do just that using .gitattributes and a little shell script:misc/gemdiff.sh:#!/bin/bashecho "============== metadata =============="tar -xOf $1 metadata.gz 2>/dev/null | gunzip -c 2>/dev/nullecho "============== checksums ============="tar -xOf $1 checksums.yaml.gz 2>/dev/null | gunzip -c 2>/dev/nullecho "=============== files ================"tar -xOf $1 data.tar.gz 2>/dev/null | tar -xvOzf - 2>&1#!/bin/bashecho "============== metadata =============="tar -xOf $1 metadata.gz 2>/dev/null | gunzip -c 2>/dev/nullecho "============== checksums ============="tar -xOf $1 checksums.yaml.gz 2>/dev/null | gunzip -c 2>/dev/nullecho "=============== files ================"tar -xOf $1 data.tar.gz 2>/dev/null