threads / patch / 3462

patchgit-fetch: print the new and old ref when fast-forwarding

Subject: [PATCH] git-fetch: print the new and old ref when fast-forwarding

## tl;dr

3 messages between Feb 25, 2006 and Feb 25, 2006. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Lukas Sandström· Feb 25, 2006, 11:20 UTC · lore

Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se>

--- This is useful when you check out new changes with gitk. Just copy/paste the old ref into gitk from the terminal.

 git-fetch.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

78f2844c17bb8627e84389e3026906d074c43363

Show changes to git-fetch.sh +1 −0

diff --git a/git-fetch.sh b/git-fetch.sh
index fcc24f8..a3e2a34 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -164,6 +164,7 @@ fast_forward_local () {
 		;;
 	    *,$local)
 		echo >&2 "* $1: fast forward to $3"
+		echo >&2 "  from $local to $2"
 		git-update-ref "$1" "$2" "$local"
 		;;
 	    *)

-- 
1.2.3.gc412

Johannes Schindelin· Feb 25, 2006, 20:08 UTC · re: Lukas Sandström · lore

Re: [PATCH] git-fetch: print the new and old ref when fast-forwarding

Hi,

On Sat, 25 Feb 2006, Lukas Sandström wrote:

> This is useful when you check out new changes with gitk.
> Just copy/paste the old ref into gitk from the terminal.

Why does "gitk ORIG_HEAD..HEAD" not work? (It also does the correct thing when pulling...)

Hth, Dscho

Junio C Hamano· Feb 25, 2006, 20:53 UTC · re: Johannes Schindelin · lore

Re: [PATCH] git-fetch: print the new and old ref when fast-forwarding

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Show 5 quoted lines

>> This is useful when you check out new changes with gitk.
>> Just copy/paste the old ref into gitk from the terminal.
>
> Why does "gitk ORIG_HEAD..HEAD" not work? (It also does the correct thing 
> when pulling...)

For most projects and repositories with single interesting head, that would work just fine.

If you use additional Pull: lines to track more than one remote refs, this patch would help.

For example, if you are tracking my "next" while keeping an eye on my "master" and "pu", your .git/remotes/origin file may have something like this:

	URL: git://git.kernel.org/pub/scm/git/git.git
        Pull: next:origin
        Pull: master:ko-master
        Pull: pu:ko-pu

When "git pull origin" pulls my next branch into your current branch (typically "master"), it also fast forwards your tracking branches ko-master and ko-pu. If you want to see what I merged in the meantime, you would want to get the old value of ko-master and the new value and feed them to gitk (or git log). ORIG_HEAD in this case was the old value of _your_ current branch head, and is not useful to see what happened to my master branch.