diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-09-18 20:30:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-18 20:30:12 -0700 |
| commit | 3791f77c28f233df121da2f83abf7eefc7b49b69 (patch) | |
| tree | 8c50a58cf599933aa412a30d7cac615092d42aa0 /sha1_file.c | |
| parent | Merge branch 'jc/diff-prefix' (diff) | |
| parent | Merge branch 'dp/maint-rebase-fix' into maint (diff) | |
| download | tgif-3791f77c28f233df121da2f83abf7eefc7b49b69.tar.xz | |
Merge branch 'maint'
* maint:
sha1_file: link() returns -1 on failure, not errno
Make git archive respect core.autocrlf when creating zip format archives
Add new test to demonstrate git archive core.autocrlf inconsistency
gitweb: avoid warnings for commits without body
Clarified gitattributes documentation regarding custom hunk header.
git-svn: fix handling of even funkier branch names
git-svn: Always create a new RA when calling do_switch for svn://
git-svn: factor out svnserve test code for later use
diff/diff-files: do not use --cc too aggressively
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c index 9ee1ed16ad..aec81bbae7 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2136,7 +2136,9 @@ static void write_sha1_file_prepare(const void *buf, unsigned long len, */ int move_temp_to_file(const char *tmpfile, const char *filename) { - int ret = link(tmpfile, filename); + int ret = 0; + if (link(tmpfile, filename)) + ret = errno; /* * Coda hack - coda doesn't like cross-directory links, |