From a701a5eb2e0c68b4612ed0a9e4157915593934fc Mon Sep 17 00:00:00 2001 From: Adam Hollidge Date: Sat, 4 Aug 2018 13:04:47 -0400 Subject: [PATCH 1/3] Fix local repo paths in contributor guidance. --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ff9fe853..15bd560f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,8 +13,8 @@ with your personal GitHub account. Then, clone the fork into your `$GOPATH`: ```bash git clone git@github.com:/container-diff.git -$GOPATH/src/github.com/GoogleContainerTools && -cd $GOPATH/src/github.com/GoogleContainerTools/container-diff && +$GOPATH/src/github.com//container-diff && +cd $GOPATH/src/github.com//container-diff && git remote add upstream git@github.com:GoogleContainerTools/container-diff.git ``` From 93069fa49157991c180f36859071d655b114c505 Mon Sep 17 00:00:00 2001 From: Adam Hollidge Date: Sat, 4 Aug 2018 14:08:41 -0400 Subject: [PATCH 2/3] Update guidance so import paths still work. --- CONTRIBUTING.md | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 15bd560f..6d6a5f33 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,20 +9,18 @@ If you haven't written Go code on your machine before, first follow the official Golang instructions for setting up your environment: https://golang.org/doc/code.html Once you have your environment set up, create a fork of the container-diff repository -with your personal GitHub account. Then, clone the fork into your `$GOPATH`: +with your personal GitHub account. Then, set your fork as a remote for the project in +your `$GOPATH`: ```bash -git clone git@github.com:/container-diff.git -$GOPATH/src/github.com//container-diff && -cd $GOPATH/src/github.com//container-diff && -git remote add upstream git@github.com:GoogleContainerTools/container-diff.git +go get -u github.com/GoogleContainerTools/container-diff && +cd $GOPATH/src/github.com/GoogleContainerTools/container-diff && +git remote add fork git@github.com:/container-diff ``` -The last command here sets the official repository as an upstream repository for -your fork, so you can keep your fork in sync with `MASTER`: - +You can now push changes to your fork: ```bash -(container-diff) git pull upstream master && git push origin master +(container-diff) git push fork ``` ## Building From 570a6ebed04eb2c6bd44028c2c58f3071dfd8fef Mon Sep 17 00:00:00 2001 From: Adam Hollidge Date: Sun, 5 Aug 2018 15:11:10 -0400 Subject: [PATCH 3/3] Update guidance. --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6d6a5f33..a5cc1fcf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,7 +20,7 @@ git remote add fork git@github.com:/container-diff You can now push changes to your fork: ```bash -(container-diff) git push fork +(container-diff) git pull origin master && git push fork ``` ## Building