git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Linus Torvalds <torvalds@osdl.org>
To: Junio C Hamano <junkio@cox.net>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Ugly "git pull .." merge messages
Date: Fri, 2 Sep 2005 00:46:24 -0700 (PDT)	[thread overview]
Message-ID: <Pine.LNX.4.58.0509011117130.6795@evo.osdl.org> (raw)


Junio, I think this happened when you rewrote the pull/push stuff to do
shorthands..

Lately, "git pull" generates a lot of extra crud in the single-line commit
message, which is annoying because a lot of tools will thus actually not
show enough of the line to be valid.

For example, it used to get rid of the ".git" at the end, and it didn't
bother to say "HEAD". So

    Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-arm.git

used to be just

    Merge master.kernel.org:/home/rmk/linux-2.6-arm

which is actually much nicer. It tends to fit in the gitk description
window.

In this example:

    Merge refs/heads/release from master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

I had manually removed the ".git" (since git-fetch-pack will happily add
it back), so it doesn't have the ".git" at the end of the message, but
instead it has a ref-name that is the internal git path rather than the
path that I actually specified. Now, we didn't use to be shorter, but at
least it used to be more readable, with

    Merge 'release' branch of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

(Ok, it's slightly shorter, but not much - but my point is that it's
actually more readable).

Could we get the nicer messages back, please?

		Linus

             reply	other threads:[~2005-09-02  7:46 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-09-02  7:46 Linus Torvalds [this message]
2005-09-02  9:39 ` [PATCH] Fix automerge message Junio C Hamano

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Pine.LNX.4.58.0509011117130.6795@evo.osdl.org \
    --to=torvalds@osdl.org \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).