NO-JIRA: go: restore go1 branch for go-get Allows the go-get subtree to be updated, tested and served on the proton repo. If required the go1 branch can also be pushed to a separate repo.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/f70afb69 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/f70afb69 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/f70afb69 Branch: refs/heads/go1 Commit: f70afb69788c2652561bda625005a8f8cf7be53e Parents: bc0a242 Author: Alan Conway <acon...@redhat.com> Authored: Fri Oct 23 09:28:51 2015 -0400 Committer: Alan Conway <acon...@redhat.com> Committed: Fri Oct 23 09:48:51 2015 -0400 ---------------------------------------------------------------------- .../bindings/go/src/qpid.apache.org/README.md | 8 +++--- .../go/src/qpid.apache.org/go-get-repo.sh | 26 -------------------- .../go/src/qpid.apache.org/readme-branch.md | 7 ++++++ 3 files changed, 11 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/f70afb69/proton-c/bindings/go/src/qpid.apache.org/README.md ---------------------------------------------------------------------- diff --git a/proton-c/bindings/go/src/qpid.apache.org/README.md b/proton-c/bindings/go/src/qpid.apache.org/README.md index 21dcc19..4b2da12 100644 --- a/proton-c/bindings/go/src/qpid.apache.org/README.md +++ b/proton-c/bindings/go/src/qpid.apache.org/README.md @@ -1,4 +1,4 @@ -# Qpid Go Libraries for AMQP +# Qpid Go packages for AMQP These packages provide [Go](http://golang.org) support for sending and receiving AMQP messages in client or server applications. Reference documentation is @@ -15,8 +15,8 @@ simple, concurrent-safe API for sending and receiving messages. It can be used with goroutines and channels to build concurrent AMQP clients and servers. [qpid.apache.org/proton](http://godoc.org/qpid.apache.org/proton) is an -event-driven, concurrent-unsafe library that closely follows the proton C -API. Most Go programmers will find the electron library easier to use. +event-driven, concurrent-unsafe package that closely follows the proton C +API. Most Go programmers will find the electron package easier to use. There are [examples](https://github.com/apache/qpid-proton/blob/master/examples/go/README.md) to help you get started. @@ -93,4 +93,4 @@ If you are new to Go then these are a good place to start: - [A Tour of Go](http://tour.golang.org) - [Effective Go](http://golang.org/doc/effective_go.html) -Then look at the tools and library docs at <http://golang.org> as you need them. +Then look at the tools and docs at <http://golang.org> as you need them. http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/f70afb69/proton-c/bindings/go/src/qpid.apache.org/go-get-repo.sh ---------------------------------------------------------------------- diff --git a/proton-c/bindings/go/src/qpid.apache.org/go-get-repo.sh b/proton-c/bindings/go/src/qpid.apache.org/go-get-repo.sh deleted file mode 100755 index 3a84191..0000000 --- a/proton-c/bindings/go/src/qpid.apache.org/go-get-repo.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# This script is used to create a repository to support the "go get" command. -# -# WARNING: DO NOT run in the main proton repository. -# -# This script will REPLACE the master branch of the current repository with just -# the Go subset of the proton repository. -# -# Currently the go-get repository is: https://github.com/alanconway/proton-go.git -# - -set -e -x -# Safety check: the repo for `go get` should have a branch called proton_go_get_master -git checkout proton_go_get_master -git checkout master -git fetch -f https://git-wip-us.apache.org/repos/asf/qpid-proton.git master:proton_go_get_master -git checkout proton_go_get_master -git branch -f -D master # Will replace master with the go subtree of proton -git subtree split --prefix=proton-c/bindings/go/src/qpid.apache.org -b master -git checkout master - -set +x -echo -echo TO FINISH: -echo git push -f -u origin master http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/f70afb69/proton-c/bindings/go/src/qpid.apache.org/readme-branch.md ---------------------------------------------------------------------- diff --git a/proton-c/bindings/go/src/qpid.apache.org/readme-branch.md b/proton-c/bindings/go/src/qpid.apache.org/readme-branch.md new file mode 100644 index 0000000..b488eea --- /dev/null +++ b/proton-c/bindings/go/src/qpid.apache.org/readme-branch.md @@ -0,0 +1,7 @@ +`go1` is a special branch for the `go get` command, it contains just the Go subtree of proton. + +Created with: `git subtree split --prefix=proton-c/bindings/go/src/qpid.apache.org -b go1` +Update with: `git checkout go1; git merge -s subtree master` + +To see the branch description: `git config branch.go1.description` + --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
