Re: [PATCH] show-branch --upstream: add upstream branches to the list of branches to display

From: Mike Hommey <mh@glandium.org>
Date: Jan 13, 2015, 01:33 UTC
Message-ID: <20150113013349.GA26587@glandium.org>
In-Reply-To: <1420708657-20811-1-git-send-email-mh@glandium.org>

On Thu, Jan 08, 2015 at 06:17:37PM +0900, Mike Hommey wrote:

Show 18 quoted lines

> `git show-branch --upstream` is equivalent to `git show-branch
> $(git for-each-ref refs/heads --format '%(refname:short)')
> $(git for-each-ref refs/heads --format '%(upstream:short)')`
> 
> `git show-branch --upstream foo bar` is equivalent to `git show-branch
> foo bar $(git for-each-ref refs/heads/foo refs/heads/bar
> --format '%(upstream:short)')`
> 
> Combined with --topics, it shows commits that are NOT on any of
> the upstream branches.
> 
> Signed-off-by: Mike Hommey <mh@glandium.org>
> ---
> 
> Note that in the --topics --upstream case, when there are different
> upstreams branches involved, only the merge-base of all of them is
> shown. I'm not sure if it's desirable to show more. The output as it
> is works for my own use cases.

Some example output (where inbound/default and b2g-inbound/default are two
different upstream repositories):
$ git show-branch --upstream HEAD
! [HEAD] Bug 1120680 - try: -b do -p emulator,emulator-jb,emulator-kk -t none -u none
 ! [b2g-inbound/default] Bumping manifests a=b2g-bump
--
+  [HEAD] Bug 1120680 - try: -b do -p emulator,emulator-jb,emulator-kk -t none -u none
 + [b2g-inbound/default] Bumping manifests a=b2g-bump
 + [b2g-inbound/default^] Backed out changeset ffdc6e420153 (bug 1107009) for Android crashes/asserts.
 + [b2g-inbound/default~2] Bumping manifests a=b2g-bump
-- [HEAD^] Merge m-c to b2g-inbound. a=merge

$ git show-branch --upstream --topics HEAD
! [HEAD] Bug 1120680 - try: -b do -p emulator,emulator-jb,emulator-kk -t none -u none
 ! [b2g-inbound/default] Bumping manifests a=b2g-bump
--
+  [HEAD] Bug 1120680 - try: -b do -p emulator,emulator-jb,emulator-kk -t none -u none
-- [HEAD^] Merge m-c to b2g-inbound. a=merge

$ git show-branch --upstream --topics
! [bug1107677] Bug 1107677 - Enable chunk recycling for 128 chunks in jemalloc3
 ! [bug1110760] Bug 1110760 - Followup to avoid build failure with Windows SDK v7.0 and v7.0A
  ! [bug1120272] Bug 1120272 - wip
   * [bug1120680] Bug 1120680 - try: -b do -p emulator,emulator-jb,emulator-kk -t none -u none
    ! [inbound/default] Bug 762449 - Enable jemalloc 3 by default, but don' make it ride the trains yet. r=njn
     ! [b2g-inbound/default] Bumping manifests a=b2g-bump
------
   *   [bug1120680] Bug 1120680 - try: -b do -p emulator,emulator-jb,emulator-kk -t none -u none
  +    [bug1120272] Bug 1120272 - wip
 +     [bug1110760] Bug 1110760 - Followup to avoid build failure with Windows SDK v7.0 and v7.0A
+      [bug1107677] Bug 1107677 - Enable chunk recycling for 128 chunks in jemalloc3
+      [bug1107677^] Bug 1107677 - Port relevant parts from bug 1073662 part 6
+      [bug1107677~2] Bug 1107677 - Port the relevant parts from bug 1073662 part 5
+++*++ [bug1110760~183] Bug 1118950 - Fix mistyped DEBUG condition in GlobalHelperThreadState(). r=bhackett.

Mike