mirror of
https://github.com/git/git.git
synced 2024-11-16 14:04:52 +01:00
Mirror of https://github.com/git/git
64cab59159
HPA noticed that git-rebase fails when changes involve symlinks in the middle of the hierarchy. Consider: * The tree state before the patch is applied has arch/x86_64/boot as a symlink pointing at ../i386/boot/ * The patch tries to remove arch/x86_64/boot symlink, and create bunch of files there: .gitignore, Makefile, etc. git-apply tries to be careful while applying patches; it never touches the working tree until it is convinced that the patch would apply cleanly. One of the check it does is that when it knows a path is going to be created by the patch, it runs lstat() on the path to make sure it does not exist. This leads to a false alarm. Because we do not touch the working tree before all the check passes, when we try to make sure that arch/x86_64/boot/.gitignore does not exist yet, we haven't removed the arch/x86_64/boot symlink. The lstat() check ends up seeing arch/i386/boot/.gitignore through the yet-to-be-removed symlink, and says "Hey, you already have a file there, but what you fed me is a patch to create a new file. I am not going to clobber what you have in the working tree." We have similar checks to see a file we are going to modify does exist and match the preimage of the diff, which is done by directly opening and reading the file. For a file we are going to delete, we make sure that it does exist and matches what is going to be removed (a removal patch records the full preimage, so we check what you have in your working tree matches it in full -- otherwise we would risk losing your local changes), which again is done by directly opening and reading the file. These checks need to be adjusted so that they are not fooled by symlinks in the middle. - To make sure something does not exist, first lstat(). If it does not exist, it does not, so be happy. If it _does_, we might be getting fooled by a symlink in the middle, so break leading paths and see if there are symlinks involved. When we are checking for a path a/b/c/d, if any of a, a/b, a/b/c is a symlink, then a/b/c/d does _NOT_ exist, for the purpose of our test. This would fix this particular case you saw, and would not add extra overhead in the usual case. - To make sure something already exists, first lstat(). If it does not exist, barf (up to this, we already do). Even if it does seem to exist, we might be getting fooled by a symlink in the middle, so make sure leading paths are not symlinks. This would make the normal codepath much more expensive for deep trees, which is a bit worrisome. This patch implements the first side of the check "making sure it does not exist". The latter "making sure it exists" check is not done yet, so applying the patch in reverse would still fail, but we have to start from somewhere. Signed-off-by: Junio C Hamano <junkio@cox.net> |
||
|---|---|---|
| arm | ||
| compat | ||
| contrib | ||
| Documentation | ||
| git-gui | ||
| gitweb | ||
| mozilla-sha1 | ||
| perl | ||
| ppc | ||
| t | ||
| templates | ||
| xdiff | ||
| .gitignore | ||
| .mailmap | ||
| alloc.c | ||
| archive-tar.c | ||
| archive-zip.c | ||
| archive.h | ||
| attr.c | ||
| attr.h | ||
| base85.c | ||
| blob.c | ||
| blob.h | ||
| builtin-add.c | ||
| builtin-annotate.c | ||
| builtin-apply.c | ||
| builtin-archive.c | ||
| builtin-blame.c | ||
| builtin-branch.c | ||
| builtin-bundle.c | ||
| builtin-cat-file.c | ||
| builtin-check-attr.c | ||
| builtin-check-ref-format.c | ||
| builtin-checkout-index.c | ||
| builtin-commit-tree.c | ||
| builtin-config.c | ||
| builtin-count-objects.c | ||
| builtin-describe.c | ||
| builtin-diff-files.c | ||
| builtin-diff-index.c | ||
| builtin-diff-tree.c | ||
| builtin-diff.c | ||
| builtin-fetch--tool.c | ||
| builtin-fmt-merge-msg.c | ||
| builtin-for-each-ref.c | ||
| builtin-fsck.c | ||
| builtin-gc.c | ||
| builtin-grep.c | ||
| builtin-init-db.c | ||
| builtin-log.c | ||
| builtin-ls-files.c | ||
| builtin-ls-tree.c | ||
| builtin-mailinfo.c | ||
| builtin-mailsplit.c | ||
| builtin-merge-base.c | ||
| builtin-merge-file.c | ||
| builtin-mv.c | ||
| builtin-name-rev.c | ||
| builtin-pack-objects.c | ||
| builtin-pack-refs.c | ||
| builtin-prune-packed.c | ||
| builtin-prune.c | ||
| builtin-push.c | ||
| builtin-read-tree.c | ||
| builtin-reflog.c | ||
| builtin-rerere.c | ||
| builtin-rev-list.c | ||
| builtin-rev-parse.c | ||
| builtin-revert.c | ||
| builtin-rm.c | ||
| builtin-runstatus.c | ||
| builtin-shortlog.c | ||
| builtin-show-branch.c | ||
| builtin-show-ref.c | ||
| builtin-stripspace.c | ||
| builtin-symbolic-ref.c | ||
| builtin-tar-tree.c | ||
| builtin-unpack-objects.c | ||
| builtin-update-index.c | ||
| builtin-update-ref.c | ||
| builtin-upload-archive.c | ||
| builtin-verify-pack.c | ||
| builtin-write-tree.c | ||
| builtin.h | ||
| cache-tree.c | ||
| cache-tree.h | ||
| cache.h | ||
| check-builtins.sh | ||
| check-racy.c | ||
| color.c | ||
| color.h | ||
| combine-diff.c | ||
| commit.c | ||
| commit.h | ||
| config.c | ||
| config.mak.in | ||
| configure.ac | ||
| connect.c | ||
| convert-objects.c | ||
| convert.c | ||
| copy.c | ||
| COPYING | ||
| csum-file.c | ||
| csum-file.h | ||
| ctype.c | ||
| daemon.c | ||
| date.c | ||
| decorate.c | ||
| decorate.h | ||
| delta.h | ||
| diff-delta.c | ||
| diff-lib.c | ||
| diff.c | ||
| diff.h | ||
| diffcore-break.c | ||
| diffcore-delta.c | ||
| diffcore-order.c | ||
| diffcore-pickaxe.c | ||
| diffcore-rename.c | ||
| diffcore.h | ||
| dir.c | ||
| dir.h | ||
| dump-cache-tree.c | ||
| entry.c | ||
| environment.c | ||
| exec_cmd.c | ||
| exec_cmd.h | ||
| fast-import.c | ||
| fetch-pack.c | ||
| fetch.c | ||
| fetch.h | ||
| generate-cmdlist.sh | ||
| git-add--interactive.perl | ||
| git-am.sh | ||
| git-applymbox.sh | ||
| git-applypatch.sh | ||
| git-archimport.perl | ||
| git-bisect.sh | ||
| git-checkout.sh | ||
| git-clean.sh | ||
| git-clone.sh | ||
| git-commit.sh | ||
| git-compat-util.h | ||
| git-cvsexportcommit.perl | ||
| git-cvsimport.perl | ||
| git-cvsserver.perl | ||
| git-fetch.sh | ||
| git-instaweb.sh | ||
| git-lost-found.sh | ||
| git-ls-remote.sh | ||
| git-merge-octopus.sh | ||
| git-merge-one-file.sh | ||
| git-merge-ours.sh | ||
| git-merge-resolve.sh | ||
| git-merge-stupid.sh | ||
| git-merge.sh | ||
| git-mergetool.sh | ||
| git-p4import.py | ||
| git-parse-remote.sh | ||
| git-pull.sh | ||
| git-quiltimport.sh | ||
| git-rebase.sh | ||
| git-relink.perl | ||
| git-remote.perl | ||
| git-repack.sh | ||
| git-request-pull.sh | ||
| git-reset.sh | ||
| git-send-email.perl | ||
| git-sh-setup.sh | ||
| git-svn.perl | ||
| git-svnimport.perl | ||
| git-tag.sh | ||
| git-verify-tag.sh | ||
| GIT-VERSION-GEN | ||
| git.c | ||
| git.spec.in | ||
| gitk | ||
| grep.c | ||
| grep.h | ||
| hash-object.c | ||
| help.c | ||
| http-fetch.c | ||
| http-push.c | ||
| http.c | ||
| http.h | ||
| ident.c | ||
| imap-send.c | ||
| index-pack.c | ||
| INSTALL | ||
| interpolate.c | ||
| interpolate.h | ||
| list-objects.c | ||
| list-objects.h | ||
| local-fetch.c | ||
| lockfile.c | ||
| log-tree.c | ||
| log-tree.h | ||
| mailmap.c | ||
| mailmap.h | ||
| Makefile | ||
| match-trees.c | ||
| merge-file.c | ||
| merge-index.c | ||
| merge-recursive.c | ||
| merge-tree.c | ||
| mktag.c | ||
| mktree.c | ||
| object-refs.c | ||
| object.c | ||
| object.h | ||
| pack-check.c | ||
| pack-redundant.c | ||
| pack-write.c | ||
| pack.h | ||
| pager.c | ||
| patch-delta.c | ||
| patch-id.c | ||
| patch-ids.c | ||
| patch-ids.h | ||
| path-list.c | ||
| path-list.h | ||
| path.c | ||
| peek-remote.c | ||
| pkt-line.c | ||
| pkt-line.h | ||
| progress.c | ||
| progress.h | ||
| quote.c | ||
| quote.h | ||
| reachable.c | ||
| reachable.h | ||
| read-cache.c | ||
| README | ||
| receive-pack.c | ||
| reflog-walk.c | ||
| reflog-walk.h | ||
| refs.c | ||
| refs.h | ||
| RelNotes | ||
| revision.c | ||
| revision.h | ||
| rsh.c | ||
| rsh.h | ||
| run-command.c | ||
| run-command.h | ||
| send-pack.c | ||
| server-info.c | ||
| setup.c | ||
| sha1_file.c | ||
| sha1_name.c | ||
| shallow.c | ||
| shell.c | ||
| show-index.c | ||
| sideband.c | ||
| sideband.h | ||
| ssh-fetch.c | ||
| ssh-pull.c | ||
| ssh-push.c | ||
| ssh-upload.c | ||
| strbuf.c | ||
| strbuf.h | ||
| symlinks.c | ||
| tag.c | ||
| tag.h | ||
| tar.h | ||
| test-chmtime.c | ||
| test-date.c | ||
| test-delta.c | ||
| test-genrandom.c | ||
| test-match-trees.c | ||
| test-sha1.c | ||
| test-sha1.sh | ||
| trace.c | ||
| tree-diff.c | ||
| tree-walk.c | ||
| tree-walk.h | ||
| tree.c | ||
| tree.h | ||
| unpack-file.c | ||
| unpack-trees.c | ||
| unpack-trees.h | ||
| update-server-info.c | ||
| upload-pack.c | ||
| usage.c | ||
| utf8.c | ||
| utf8.h | ||
| var.c | ||
| write_or_die.c | ||
| wt-status.c | ||
| wt-status.h | ||
| xdiff-interface.c | ||
| xdiff-interface.h | ||
//////////////////////////////////////////////////////////////// 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/tutorial.txt to get started, then see Documentation/everyday.txt for a useful minimum set of commands, and "man git-commandname" for documentation of each command. CVS users may also want to read Documentation/cvs-migration.txt. Many Git online resources are accessible from http://git.or.cz/ 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.