From: "Santi Béjar" <sbejar@gmail.com>
To: git <git@vger.kernel.org>
Subject: [PATCH 4/5] fetch: Add output for the not fast forward case
Date: Fri, 29 Sep 2006 20:07:19 +0200 [thread overview]
Message-ID: <87ac4i1r8o.fsf@gmail.com> (raw)
In-Reply-To: <87r6xu1rci.fsf@gmail.com> (Santi Béjar's message of "Fri, 29 Sep 2006 20:05:01 +0200")
Use the ... notation to be able to use this directly in "git log" to see
how the two non-fast-forward heads have diverged.
Signed-off-by: Santi Béjar <sbejar@gmail.com>
---
git-fetch.sh | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/git-fetch.sh b/git-fetch.sh
index 32553f8..ee4f5bd 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -190,6 +190,7 @@ fast_forward_local () {
;;
esac || {
echo >&2 "* $1: does not fast forward to $3;"
+ echo >&2 " $(git-rev-parse --short $local)...$(git-rev-parse --short $2)"
case ",$force,$single_force," in
*,t,*)
echo >&2 " forcing update."
--
1.4.2.1.g38049
next prev parent reply other threads:[~2006-09-29 18:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-29 18:05 [PATCH 0/5] fetch & co: misc output cleanup Santi Béjar
2006-09-29 18:05 ` [PATCH 1/5] fetch: Reset remote refs list each time fetch_main is called Santi Béjar
2006-09-29 18:06 ` [PATCH 2/5] fetch & co: Use "hash1..hash2" instead of "from hash1 to hash2" Santi Béjar
2006-09-29 18:06 ` [PATCH 3/5] fetch & co: Use short sha1 in the output Santi Béjar
2006-09-29 18:07 ` Santi Béjar [this message]
2006-09-29 18:08 ` [PATCH 5/5] fetch: Clean output Santi Béjar
2006-09-30 2:17 ` Junio C Hamano
2006-09-30 9:42 ` Santi
2006-09-30 10:37 ` Junio C Hamano
2006-09-29 18:54 ` [PATCH 0/5] fetch & co: misc output cleanup A Large Angry SCM
2006-09-29 20:48 ` Santi
2006-09-29 21:27 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87ac4i1r8o.fsf@gmail.com \
--to=sbejar@gmail.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).