Git development
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@osdl.org>
To: Junio C Hamano <junkio@cox.net>, Git Mailing List <git@vger.kernel.org>
Cc: Davide Libenzi <davidel@xmailserver.org>
Subject: Re: Add "git-update-ref" to update the HEAD (or other) ref
Date: Sun, 25 Sep 2005 12:05:35 -0700 (PDT)	[thread overview]
Message-ID: <Pine.LNX.4.58.0509251153090.3308@g5.osdl.org> (raw)
In-Reply-To: <Pine.LNX.4.58.0509251134480.3308@g5.osdl.org>



On Sun, 25 Sep 2005, Linus Torvalds wrote:
>
> This is a careful version of the script stuff that currently just
> blindly writes HEAD with a new value.

Btw, in case it wasn't clear from the patch, this only introduced 
mechanism, it didn't actually use it in any script.

But the point of the exercise is to move towards using git-update-ref in 
places like git-fetch.sh, which currently are doing some of it by hand 
(and not handling symlinks etc).

So you should be able to do something like

	..
	old=$(git-rev-parse --verify "$refname^0") >& /dev/null
	if [ "$old" ]; then
		mb=$(git-merge-base $new $old)
		if [ "$mb" != "$old" ]; then
			echo "$new is not a fast-forward of $old"
			[ "$force" ] || exit 1
			old=
		fi
	fi
	git-update-ref "$refname" $new $old

and the actual update phase will re-verify that "old" is still valid (if 
it exists at all).

Doing it by hand works, of course, but for example, if we have two
symlinks pointing to the same ref, the current locking in git-fetch.sh is
broken - it may lock the _symlink_, but since the other one _also_ points 
to the same thing, there's no locking of the _target_.

git-update-ref should do things like that right. Famous last words ;)

			Linus

  reply	other threads:[~2005-09-25 19:05 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-09-25 18:43 Add "git-update-ref" to update the HEAD (or other) ref Linus Torvalds
2005-09-25 19:05 ` Linus Torvalds [this message]
2005-09-25 22:37   ` Junio C Hamano
2005-09-28  2:45   ` [PATCH] Use git-update-ref in scripts Junio C Hamano
2005-09-28 15:21     ` Linus Torvalds
2005-09-28 16:56       ` Junio C Hamano
2005-09-28 17:13         ` Linus Torvalds
2005-09-28 17:29           ` Junio C Hamano
2005-09-28 18:14             ` Linus Torvalds
2005-09-28 18:28               ` Junio C Hamano
2005-09-29 16:07                 ` Linus Torvalds
2005-09-28 18:17           ` Junio C Hamano
2005-09-28 19:47             ` Junio C Hamano
2005-09-28 21:19               ` Fredrik Kuivinen
2005-09-29 15:16             ` Linus Torvalds
2005-09-25 23:27 ` Add "git-update-ref" to update the HEAD (or other) ref Junio C Hamano
2005-09-26  0:50   ` Linus Torvalds
2005-09-26  4:25     ` Junio C Hamano
2005-09-26  1:07   ` Linus Torvalds

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=Pine.LNX.4.58.0509251153090.3308@g5.osdl.org \
    --to=torvalds@osdl.org \
    --cc=davidel@xmailserver.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox