git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marc Branchaud <marcnarc@xiplink.com>
To: git list <git@vger.kernel.org>
Subject: hooks/post-receive-email bug?
Date: Wed, 17 Jun 2009 18:21:34 -0400	[thread overview]
Message-ID: <4A396C6E.2050600@xiplink.com> (raw)

Hi all,

We currently have two main development branches: master and release.  These branches exist on our shared git server.  I had to make a change in both branches, so I made a topic branch off of their merge-base and did the work:

  o--o--A--B--C		<-- origin/master
     |\
     | X--Y		<-- origin/release
      \
       1--2--3		<-- topic

I then merged topic into both master and release.  The merges were clean:

  o--o--A--B--C---D	<-- master
     |\           |
     | X--Y----Z /	<-- release
      \       / /
       1--2--3--	<-- topic

Then I did
	git push origin
to push matching refspecs to the origin repo.

port-receive-email sent two messages for that push, one for each branch.  Each message showed that commits 1, 2 and 3 were applied to the appropriate branch:

	The branch, release has been updated
	       via  hash for Z (commit)
	       via  hash for 3 (commit)
	       via  hash for 2 (commit)
	       via  hash for 1 (commit)
	      from  hash for Y (commit)

However, the details of the topic commits were missing from both messages.  Instead, both only contained the details of the merge commits D and Z.

I was expecting at least one of the messages to have the details of commits 1, 2 and 3.  Was I wrong to expect that?

Thanks,

		M.

             reply	other threads:[~2009-06-17 22:21 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-17 22:21 Marc Branchaud [this message]
2009-07-06 14:49 ` hooks/post-receive-email bug? Marc Branchaud
2009-07-07 13:33   ` Michael J Gruber
2009-07-07 15:14     ` Marc Branchaud

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=4A396C6E.2050600@xiplink.com \
    --to=marcnarc@xiplink.com \
    --cc=git@vger.kernel.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).