Re: [GIT PULL] use generic pci_iomap on all architectures

From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Jan 11, 2012, 01:51 UTC
Message-ID: <CA+55aFwXj2ELrTDSgFfSC2Usz99-24uFSznAP34feJiCttwayQ@mail.gmail.com>
In-Reply-To: <20120106084701.8f704542754db826deda318a@canb.auug.org.au>

On Thu, Jan 5, 2012 at 1:47 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

Show 8 quoted lines

> On Fri, 6 Jan 2012 08:39:16 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> So why does you pull request refer to "commit
>> 805a6af8dba5dfdd35ec35dc52ec0122400b2610", I wonder?  Is that just what
>> "git request-pull" produced?
>
> I see, "git request-pull" just puts in whatever you specify on the
> command line rather than the merge-base ...

.. and that is a fairly silly misfeature, since it makes the "since commit xyz" largely meaningless.

I suspect we really should make "git request-pull" show the merge base(s) as the "since commit", because that way the output of git request-pull is "stable", and doesn't depend on what particular random state you've synced up to since.

Junio, I think the patch would be as simple as the attached - totally untested - one-liner? Comments?

                            Linus

 git-request-pull.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/git-request-pull.sh b/git-request-pull.sh
index d7ba1178ae75..64960d65a1c2 100755
--- a/git-request-pull.sh
+++ b/git-request-pull.sh
@@ -96,7 +96,7 @@ git show -s --format='The following changes since commit %H:
   %s (%ci)
 
 are available in the git repository at:
-' $baserev &&
+' $merge_base &&
 echo "  $url${ref+ $ref}" &&
 git show -s --format='
 for you to fetch changes up to %H: