From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Matthieu Moy <matthieu.moy@imag.fr>,
Ramkumar Ramachandra <artagnon@gmail.com>,
Jeff King <peff@peff.net>,
John Szakmeister <john@szakmeister.net>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v2 0/9] Introduce publish tracking branch
Date: Thu, 10 Apr 2014 14:04:37 -0500 [thread overview]
Message-ID: <1397156686-31349-1-git-send-email-felipe.contreras@gmail.com> (raw)
As it has been discussed before, our support for triangular workflows is
lacking, and the following patch series aims to improve that situation.
We have the concept of upstream branch (e.g. 'origin/master') which is to where
our topic branches eventually should be merged to, so it makes sense that
'git rebase' uses that as the destination, but most people would not push to
such upstream branch, they would push to a publish branch
(e.g. 'github/feature-a'). We could set our upstream to the place we push, and
'git push' would be able to use that as default, and 'git branch --vv' would
show how ahead/behind we are in comparisson to that branch, but then
'git rebase' (or 'git merge') would be using the wrong branch.
This patch series adds:
1) git push --set-publish
2) git branch --set-publish
3) git branch -vv # uses and shows the publish branch when configured
4) @{publish} and @{p} marks
5) branch.$name.{push,pushremote} configurations
After this, it becomes much easier to track branches in a triangular workflow.
The publish branch is used instead of the upstream branch for tracking
information in 'git branch --vv' and 'git status' if present, otherwise there
are no changes (upstream is used).
master e230c56 [origin/master, gh/master] Git 1.8.4
* fc/publish 0a105fd [master, gh/fc/publish: ahead 1] branch: display publish branch
fc/branch/fast 177dcad [master, gh/fc/branch/fast] branch: reorganize verbose options
fc/trivial f289b9a [master: ahead 7] branch: trivial style fix
fc/leaks d101af4 [master: ahead 2] read-cache: plug a possible leak
stable e230c56 Git 1.8.4
Changes since v1:
* Added @{publish} and @{p} marks
Felipe Contreras (9):
push: trivial reorganization
Add concept of 'publish' branch
branch: allow configuring the publish branch
t: branch add publish branch tests
push: add --set-publish option
branch: display publish branch
sha1_name: cleanup interpret_branch_name()
sha1_name: simplify track finding
sha1_name: add support for @{publish} marks
Documentation/git-branch.txt | 11 +++++++
Documentation/git-push.txt | 9 +++++-
Documentation/revisions.txt | 4 +++
branch.c | 43 +++++++++++++++++++++++++
branch.h | 2 ++
builtin/branch.c | 74 ++++++++++++++++++++++++++++++++++++++----
builtin/push.c | 52 +++++++++++++++++++-----------
remote.c | 34 ++++++++++++++++----
remote.h | 4 +++
sha1_name.c | 62 ++++++++++++++++++++++--------------
t/t1508-at-combinations.sh | 5 +++
t/t3200-branch.sh | 76 ++++++++++++++++++++++++++++++++++++++++++++
t/t5529-push-publish.sh | 70 ++++++++++++++++++++++++++++++++++++++++
t/t6040-tracking-info.sh | 5 +--
transport.c | 28 ++++++++++------
transport.h | 1 +
16 files changed, 415 insertions(+), 65 deletions(-)
create mode 100755 t/t5529-push-publish.sh
--
1.9.1+fc1
next reply other threads:[~2014-04-10 19:14 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-10 19:04 Felipe Contreras [this message]
2014-04-10 19:04 ` [PATCH v2 1/9] push: trivial reorganization Felipe Contreras
2014-04-10 19:04 ` [PATCH v2 2/9] Add concept of 'publish' branch Felipe Contreras
2014-04-10 19:04 ` [PATCH v2 3/9] branch: allow configuring the publish branch Felipe Contreras
2014-04-10 19:04 ` [PATCH v2 4/9] t: branch add publish branch tests Felipe Contreras
2014-04-10 19:04 ` [PATCH v2 5/9] push: add --set-publish option Felipe Contreras
2014-04-10 19:04 ` [PATCH v2 6/9] branch: display publish branch Felipe Contreras
2014-04-10 22:03 ` Ramkumar Ramachandra
2014-04-10 22:36 ` Felipe Contreras
2014-04-11 11:17 ` Jeff King
2014-04-11 13:48 ` Felipe Contreras
2014-04-12 11:23 ` Jeff King
2014-04-12 14:34 ` Felipe Contreras
2014-04-11 19:24 ` Junio C Hamano
2014-04-11 19:50 ` Felipe Contreras
2014-04-12 11:42 ` Jeff King
2014-04-12 15:05 ` Felipe Contreras
2014-04-15 5:43 ` Jeff King
2014-04-18 23:29 ` Felipe Contreras
2014-04-10 19:04 ` [PATCH v2 7/9] sha1_name: cleanup interpret_branch_name() Felipe Contreras
2014-04-10 21:45 ` Ramkumar Ramachandra
2014-04-10 19:04 ` [PATCH v2 8/9] sha1_name: simplify track finding Felipe Contreras
2014-04-10 21:44 ` Ramkumar Ramachandra
2014-04-10 22:27 ` Felipe Contreras
2014-04-10 19:04 ` [PATCH v2 9/9] sha1_name: add support for @{publish} marks Felipe Contreras
2014-04-10 21:40 ` Ramkumar Ramachandra
2014-04-10 22:25 ` Felipe Contreras
2014-04-10 21:49 ` Ramkumar Ramachandra
2014-04-10 22:28 ` Felipe Contreras
2014-04-10 21:21 ` [PATCH v2 0/9] Introduce publish tracking branch Junio C Hamano
2014-04-11 9:15 ` Matthieu Moy
2014-04-11 14:25 ` Felipe Contreras
2014-04-11 17:25 ` Matthieu Moy
2014-04-11 19:16 ` Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1397156686-31349-1-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=john@szakmeister.net \
--cc=matthieu.moy@imag.fr \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.