git/git-merge-one-file-script, branch v0.99

[PATCH] git-merge-one-file-script: do not misinterpret rm failure.

2005-06-25T23:52:16Z

When a merge adds a file DF and removes a directory there by deleting a path DF/DF, git-merge-one-file-script can be called for the removal of DF/DF when the path DF is already created by "git-read-tree -m -u". When this happens, we get confused by a failure return from 'rm -f -- "$4"' (where $4 is DF/DF); finding file DF there the "rm -f" command complains that DF is not a directory. What we want to ensure is that there is no file DF/DF in this case. Avoid getting ourselves confused by first checking if there is a file, and only then try to remove it (and check for failure from the "rm" command). Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds

One more time.. Clean up git-merge-one-file-script

2005-06-09T00:56:09Z

This uses git-checkout-file to make sure that the full pathname is created, instead of the script having to verify it by hand. Also, simplify the 3-way merge case by just writing to the right file and setting the initial index contents early.

Fix up git-merge-one-file-script

2005-06-09T00:36:47Z

Junio points out that we may need to create the path leading up the the file we merge. And we need to be more careful with the "exec"s we've done to exit on success - only do the on the last command in the pipeline, not the first one ;)

Merge my and Petr's git-merge-one-file-script modifications

2005-06-08T23:54:23Z

[PATCH] git-merge-one-file-script cleanups from Cogito

2005-06-08T23:51:26Z

Chain the resolving sequences (e.g. git-cat-file - chmod - git-update-cache) through &&s so we stop right away in case one of the command fails, and report the error code to the script caller. Also add a copyright notice, some blank lines, ;; on a separate line, and nicer error messages. Signed-off-by: Petr Baudis Signed-off-by: Linus Torvalds

Make sure we error out if we can't remove a file on automatic merges.

2005-06-08T23:35:30Z

Pointed out by Junio.

[PATCH] Fix git-merge-one-file permissions auto-merging

2005-06-08T22:54:45Z

In the automerge case, permissions were not restored properly after the merge tool was invoked and overwrote the target file. Signed-off-by: Petr Baudis Signed-off-by: Linus Torvalds

Leave merge failures in the filesystem

2005-06-08T18:40:59Z

This changes how we handle merges: if a automated merge fails, we will leave the index as a clean entry pointing to the original branch, and leave the actual file _dirty_ the way the "merge" program left it. You can then just do "git-diff-files -p" to see what the merge conflicts did, fix them up, and commit the end result. NOTE NOTE NOTE! Do _not_ use "git commit" to commit such a merge. It won't set the parents right. I'll need to fix that. In the meantime, you'd need to merge using git-commit-tree $(git-write) -p HEAD -p MERGE_HEAD or something like that by hand.

Use backticks in git-merge-one-file-script instead of $(command).

2005-05-07T19:26:15Z

Thomas Glanzmann says that shell he uses on Solaris cannot grok $(command) but the script does not use nested $(command) and works happily just by using backticks instead. Signed-off-by: Junio C Hamano

Update git-merge-one-file-script.

2005-05-02T06:53:32Z

With this change, git-merge-one-file-script ceases to smudge files in the work tree when recording the trivial merge results (conflicting auto-merge failure case does not touch the work tree file as before). Signed-off-by: Junio C Hamano