git/git-merge-one-file-script, branch master

Big tool rename.

2005-09-08T00:45:20Z

As promised, this is the "big tool rename" patch. The primary differences since 0.99.6 are: (1) git-*-script are no more. The commands installed do not have any such suffix so users do not have to remember if something is implemented as a shell script or not. (2) Many command names with 'cache' in them are renamed with 'index' if that is what they mean. There are backward compatibility symblic links so that you and Porcelains can keep using the old names, but the backward compatibility support is expected to be removed in the near future. Signed-off-by: Junio C Hamano

[PATCH] Make "git resolve" less scary

2005-08-30T05:55:42Z

When we resolve a merge between two branches, and it removes a file in the current branch, we notify the person doing the resolve with a big nice notice like Removing xyzzy which is all well and good. HOWEVER, we also do this when the file was actually removed in the current branch, and we're merging with another branch that didn't have it removed (or, indeed, if the other branch _did_ have it removed, but the common parent was far enough back that the file still existed in there). And that just doesn't make sense. In that case we're not removing anything: the file didn't exist in the branch we're merging into in the first place. So the message just makes people nervous, and makes no sense. This has been around forever, but I never bothered to do anything about it. Until now. The trivial fix is to only talk about removing files if the file existed in the branch we're merging into, but will not exist in the result. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

[PATCH] Trivial tidyups

2005-07-30T00:21:49Z

Simple whitespace-related tidyups ensuring style consistency. This is carried over from my old git-pb branch. Signed-off-by: Petr Baudis Signed-off-by: Junio C Hamano

[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