Re: [PATCHv2] git-mv: Keep moved index entries inact

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 26, 2008, 06:46 UTC
Message-ID: <7v8wvpm9cl.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20080721002508.26773.92277.stgit@localhost>

Petr Baudis <pasky@suse.cz> writes:

Show 14 quoted lines

> The rewrite of git-mv from a shell script to a builtin was perhaps
> a little too straightforward: the git add and git rm queues were
> emulated directly, which resulted in a rather complicated code and
> caused an inconsistent behaviour when moving dirty index entries;
> git mv would update the entry based on working tree state,
> except in case of overwrites, where the new entry would still have
> sha1 of the old file.
>
> This patch introduces rename_index_entry_at() into the index toolkit,
> which will rename an entry while removing any entries the new entry
> might render duplicate. This is then used in git mv instead
> of all the file queues, resulting in a major simplification
> of the code and an inevitable change in git mv -n output format.
> ...

Thanks. I think I've managed to fix the rename_index_entry_at() in a satisfactory way, and also made builtin-mv to allow "mv -f symlink file" and "mv -f file symlink".

I do not agree with the semantics of this test seems to want, though.

Show 17 quoted lines

> +test_expect_failure 'git mv should follow symlink to a directory' '
> +
> +	rm -fr .git &&
> +	git init &&
> +	echo 1 >moved &&
> +	mkdir -p dir &&
> +	touch dir/.keep &&
> +	ln -s dir symlink &&
> +	git add moved dir/.keep symlink &&
> +	git mv moved symlink &&
> +	[ ! -e moved ] &&
> +	[ -f symlink/moved ] &&
> +	[ $(cat symlink/moved) = 1 ] &&
> +	[ "$(ls dir)" = "$(ls symlink)" ] &&
> +	git diff-files --quiet
> +
> +'

A symlink to us is just a different kind of blob, and by definition a blob is the leaf level of a tree structure that represents the working tree in the index. There won't be anything hanging below it, and when adding things to the index we should not dereference the symlink to see where it leads to.

Traditionally we have been loose about this check, and the normal "git add" and "git update-index" codepath is still forever broken, and we allow:

	$ mkdir dir
        $ >dir/file
        $ ln -s dir symlink
        $ git add symlink/file

but some codepaths that matter more (because they do larger damage
unattended, as opposed to the above command sequence that can be avoided
by user education a bit more easily), such as "git apply" and "git
read-tree", have been corrected using has_symlink_leading_path() since mid
2007.  We would need to follow through c40641b (Optimize symlink/directory
detection, 2008-05-09) and further fix "git add" and "git update-index"
codepaths to forbid the above command sequence.

So my take on the above test piece is that after:

	>moved
	mkdir dir
        >dir/file
        ln -s dir symlink
	git add moved dir symlink

This should fail, as it is an overwrite:

	git mv moved symlink

and with "-f", the command should simply remove symlink and replace it with a regular file whose contents come from the original "moved".

IOW, what a symlink points at should not matter.