From 866cae0db4af936ec6f9eb6362e50db2a1a2f792 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 2 Nov 2006 18:02:17 -0800 Subject: link_temp_to_file: call adjust_shared_perm() only when we created the directory --- sha1_file.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 5fcad2893f..27eb14b922 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1382,8 +1382,7 @@ static int link_temp_to_file(const char *tmpfile, const char *filename) dir = strrchr(filename, '/'); if (dir) { *dir = 0; - mkdir(filename, 0777); - if (adjust_shared_perm(filename)) { + if (!mkdir(filename, 0777) && adjust_shared_perm(filename)) { *dir = '/'; return -2; } -- cgit v1.2.3 From 44b27ec9604b0310c4d24a283319b933a86da67d Mon Sep 17 00:00:00 2001 From: Andy Parkins Date: Thu, 2 Nov 2006 12:12:44 +0100 Subject: Minor grammar fixes for git-diff-index.txt "what you are going to commit is" doesn't need the "is" and does need a comma. "can trivially see" is an unecessary split infinitive and "easily" is a more appropriate adverb. Signed-off-by: Andy Parkins Signed-off-by: Junio C Hamano --- Documentation/git-diff-index.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt index 9cd43f105b..2df581c2c9 100644 --- a/Documentation/git-diff-index.txt +++ b/Documentation/git-diff-index.txt @@ -54,7 +54,7 @@ If '--cached' is specified, it allows you to ask: For example, let's say that you have worked on your working directory, updated some files in the index and are ready to commit. You want to see exactly -*what* you are going to commit is without having to write a new tree +*what* you are going to commit, without having to write a new tree object and compare it that way, and to do that, you just do git-diff-index --cached HEAD @@ -68,7 +68,7 @@ matches my working directory. But doing a "git-diff-index" does: -100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 commit.c +100644 blob 4161aecc6700a2eb579e842af0b7f22b98443f74 git-commit.c -You can trivially see that the above is a rename. +You can see easily that the above is a rename. In fact, "git-diff-index --cached" *should* always be entirely equivalent to actually doing a "git-write-tree" and comparing that. Except this one is much -- cgit v1.2.3 From ba158a32b9e237912ebe7dfe7bd56e2c531cb062 Mon Sep 17 00:00:00 2001 From: Andy Parkins Date: Thu, 2 Nov 2006 12:11:56 +0100 Subject: git-clone documentation didn't mention --origin as equivalent of -o Signed-off-by: Andy Parkins Signed-off-by: Junio C Hamano --- Documentation/git-clone.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index f973c64313..86060472ad 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -75,6 +75,7 @@ OPTIONS this option is used, neither the `origin` branch nor the default `remotes/origin` file is created. +--origin :: -o :: Instead of using the branch name 'origin' to keep track of the upstream repository, use instead. Note -- cgit v1.2.3