mirror of
https://github.com/git/git.git
synced 2026-03-23 07:00:08 +01:00
103e404e9d
We generally think of a rename as removing one path entirely
and placing similar content at a new path. In other words,
after a rename, the original path is now empty. But that is
not necessarily the case with rewrite detection (which is
not currently possible to do for merge-recursive).
The current merge code blindly removes paths that are used
as rename sources; however, we should check to see if there
is useful content at that path. There are basically two
interesting cases:
1. One side renames a path, but also puts new content
(or a symlink) at the same path. We want to detect the
rename, and have changes from the other side applied to
the rename destination. The new content at the original
path should be left untouched.
The current code just calls remove_file, but that
ignores the concept that the renaming side may put
something else useful there. We should detect this case
and either remove (if no new content), or put the new
content in place at the original path.
2. Both sides renamed and installed new content at the
original path. If they didn't rename to the same
destination, it is a conflict, and we already mark it
as such. But if it's the same destination, then it's
not a conflict; the renamed content will be merged at
the new destination.
For the new content at the original path, we have to do
a 3-way merge. The base must be the null sha1, because
this "slot" for content didn't exist before (it was
taken up by the content which got renamed away). So if
only one side installed new content, that content
automatically wins. If both sides did, and it is the
same content, then that content is OK. But if the
content is different, then we have a conflict and
should do the usual conflict-markers thing.
This patch implements the semantics described above, which
lays the groundwork for turning on rewrite detection.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
////////////////////////////////////////////////////////////////
GIT - the stupid content tracker
////////////////////////////////////////////////////////////////
"git" can mean anything, depending on your mood.
- random three-letter combination that is pronounceable, and not
actually used by any common UNIX command. The fact that it is a
mispronunciation of "get" may or may not be relevant.
- stupid. contemptible and despicable. simple. Take your pick from the
dictionary of slang.
- "global information tracker": you're in a good mood, and it actually
works for you. Angels sing, and a light suddenly fills the room.
- "goddamn idiotic truckload of sh*t": when it breaks
Git is a fast, scalable, distributed revision control system with an
unusually rich command set that provides both high-level operations
and full access to internals.
Git is an Open Source project covered by the GNU General Public License.
It was originally written by Linus Torvalds with help of a group of
hackers around the net. It is currently maintained by Junio C Hamano.
Please read the file INSTALL for installation instructions.
See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands, and
Documentation/git-commandname.txt for documentation of each command.
If git has been correctly installed, then the tutorial can also be
read with "man gittutorial" or "git help tutorial", and the
documentation of each command with "man git-commandname" or "git help
commandname".
CVS users may also want to read Documentation/gitcvs-migration.txt
("man gitcvs-migration" or "git help cvs-migration" if git is
installed).
Many Git online resources are accessible from http://git-scm.com/
including full documentation and Git related tools.
The user discussion and development of Git take place on the Git
mailing list -- everyone is welcome to post bug reports, feature
requests, comments and patches to git@vger.kernel.org. To subscribe
to the list, send an email with just "subscribe git" in the body to
majordomo@vger.kernel.org. The mailing list archives are available at
http://marc.theaimsgroup.com/?l=git and other archival sites.
The messages titled "A note from the maintainer", "What's in
git.git (stable)" and "What's cooking in git.git (topics)" and
the discussion following them on the mailing list give a good
reference for project status, development direction and
remaining tasks.