git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 4/5] fetch: Add output for the not fast forward case

From
SBSanti Béjar <sbejar@gmail.com>
Date
Sep 29, 2006, 18:07 UTC
Message-ID
<87ac4i1r8o.fsf@gmail.com>
In-Reply-To
<87r6xu1rci.fsf@gmail.com>

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
Previous: Santi BéjarNext: Santi Béjar
Message 5 of 12 in “fetch & co: misc output cleanup”
  1. 0/5 fetch & co: misc output cleanupSanti Béjar, Sep 29, 2006
  2. 1/5 fetch: Reset remote refs list each time fetch_main is calledSanti Béjar, Sep 29, 2006
  3. 2/5 fetch & co: Use "hash1..hash2" instead of "from hash1 to hash2"Santi Béjar, Sep 29, 2006
  4. 3/5 fetch & co: Use short sha1 in the outputSanti Béjar, Sep 29, 2006
  5. 4/5 fetch: Add output for the not fast forward caseSanti Béjar, Sep 29, 2006
  6. 5/5 fetch: Clean outputSanti Béjar, Sep 29, 2006
  7. Junio C HamanoSep 30, 2006
  8. SantiSep 30, 2006
  9. Junio C HamanoSep 30, 2006
  10. A Large Angry SCMSep 29, 2006
  11. SantiSep 29, 2006
  12. Junio C HamanoSep 29, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.