diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-02 18:05:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-02 18:05:33 -0800 |
| commit | c954d33da1c878788e7c01a50a5c1066622802c6 (patch) | |
| tree | 1a4d0fb29d1b3b66d0b7249490555604297a389d /sha1_file.c | |
| parent | cd1464083cd9e61a55148c21fd9b8eb3bf76d190 (diff) | |
| parent | ba158a32b9e237912ebe7dfe7bd56e2c531cb062 (diff) | |
| download | git-c954d33da1c878788e7c01a50a5c1066622802c6.tar.gz git-c954d33da1c878788e7c01a50a5c1066622802c6.tar.xz | |
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
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sha1_file.c b/sha1_file.c index 570706919..4e5ee1054 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; } |