diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-27 19:23:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-27 19:23:51 -0800 |
| commit | 455d0f5c23a600ff8c94642ca5123f1bd2f1ec0d (patch) | |
| tree | d6674efc969ac919afdaf98202aab53a14d20871 /sha1_file.c | |
| parent | 608efb875f89a946d5cb37b2dd4077132618e0e1 (diff) | |
| parent | 539eec48f0a101b45c5f150a2bbc067fd85bc96d (diff) | |
| download | git-455d0f5c23a600ff8c94642ca5123f1bd2f1ec0d.tar.gz git-455d0f5c23a600ff8c94642ca5123f1bd2f1ec0d.tar.xz | |
Merge branch 'maint'
* maint:
sha1_file.c: resolve confusion EACCES vs EPERM
sha1_file: avoid bogus "file exists" error message
git checkout: don't warn about unborn branch if -f is already passed
bash: offer refs instead of filenames for 'git revert'
bash: remove dashed command leftovers
git-p4: fix keyword-expansion regex
fast-export: use an unsorted string list for extra_refs
Add new testcase to show fast-export does not always exports all tags
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c index 36dad7261..6c0e251e0 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2315,7 +2315,7 @@ static int write_loose_object(const unsigned char *sha1, char *hdr, int hdrlen, filename = sha1_file_name(sha1); fd = create_tmpfile(tmpfile, sizeof(tmpfile), filename); if (fd < 0) { - if (errno == EPERM) + if (errno == EACCES) return error("insufficient permission for adding an object to repository database %s\n", get_object_directory()); else return error("unable to create temporary sha1 filename %s: %s\n", tmpfile, strerror(errno)); |