diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-03 05:05:33 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-03 05:05:33 +0300 |
| commit | c954d33da1c878788e7c01a50a5c1066622802c6 (patch) | |
| tree | 1a4d0fb29d1b3b66d0b7249490555604297a389d | |
| parent | cd1464083cd9e61a55148c21fd9b8eb3bf76d190 (diff) | |
| parent | ba158a32b9e237912ebe7dfe7bd56e2c531cb062 (diff) | |
Merge branch 'maint'
* maint:
git-clone documentation didn't mention --origin as equivalent of -o
Minor grammar fixes for git-diff-index.txt
link_temp_to_file: call adjust_shared_perm() only when we created the directory
| -rw-r--r-- | Documentation/git-clone.txt | 1 | ||||
| -rw-r--r-- | Documentation/git-diff-index.txt | 4 | ||||
| -rw-r--r-- | sha1_file.c | 3 |
3 files changed, 4 insertions, 4 deletions
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 <name>:: -o <name>:: Instead of using the branch name 'origin' to keep track of the upstream repository, use <name> instead. Note 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 diff --git a/sha1_file.c b/sha1_file.c index 570706919a..4e5ee1054f 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1399,8 +1399,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; } |