summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* contacts: add a Makefile to generate docs and installss/contrib-subtree-contactsSebastian Schuberth2014-10-152-0/+74
* subtree: add an install-html targetSebastian Schuberth2014-10-152-3/+9
* Update draft release notes to 2.2Junio C Hamano2014-10-141-0/+21
* Merge branch 'bc/asciidoc-pretty-formats-fix'Junio C Hamano2014-10-141-1/+1
|\
| * Documentation: fix misrender of pretty-formats in Asciidoctorbc/asciidoc-pretty-formats-fixbrian m. carlson2014-10-081-1/+1
* | Merge branch 'rs/plug-leak-in-bundle'Junio C Hamano2014-10-141-7/+10
|\ \
| * | bundle: plug minor memory leak in is_tag_in_date_range()rs/plug-leak-in-bundleRené Scharfe2014-10-071-7/+10
* | | Merge branch 'rs/more-uses-of-skip-prefix'Junio C Hamano2014-10-1410-75/+69
|\ \ \
| * | | use skip_prefix() to avoid more magic numbersrs/more-uses-of-skip-prefixRené Scharfe2014-10-0710-75/+69
* | | | Merge branch 'rs/mailsplit'Junio C Hamano2014-10-141-1/+0
|\ \ \ \
| * | | | mailsplit: remove unnecessary unlink(2) callrs/mailsplitRené Scharfe2014-10-071-1/+0
* | | | | Merge branch 'rs/sha1-array-test'Junio C Hamano2014-10-145-2/+130
|\ \ \ \ \
| * | | | | sha1-lookup: handle duplicates in sha1_pos()rs/sha1-array-testRené Scharfe2014-10-012-2/+20
| * | | | | sha1-array: add test-sha1-array and basic testsRené Scharfe2014-10-014-0/+110
* | | | | | Merge branch 'mh/lockfile-stdio'Junio C Hamano2014-10-145-39/+71
|\ \ \ \ \ \
| * | | | | | commit_packed_refs(): reimplement using fdopen_lock_file()mh/lockfile-stdioMichael Haggerty2014-10-011-4/+1
| * | | | | | dump_marks(): reimplement using fdopen_lock_file()Michael Haggerty2014-10-011-19/+2
| * | | | | | fdopen_lock_file(): access a lockfile using stdioMichael Haggerty2014-10-013-16/+68
* | | | | | | Merge branch 'mh/lockfile'Junio C Hamano2014-10-1436-260/+510
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | lockfile.h: extract new header file for the functions in lockfile.cmh/lockfileMichael Haggerty2014-10-0135-83/+118
| * | | | | | hold_locked_index(): move from lockfile.c to read-cache.cMichael Haggerty2014-10-012-8/+8
| * | | | | | hold_lock_file_for_append(): restore errno before returningMichael Haggerty2014-10-011-1/+8
| * | | | | | get_locked_file_path(): new functionMichael Haggerty2014-10-014-3/+16
| * | | | | | lockfile.c: rename static functionsMichael Haggerty2014-10-011-5/+5
| * | | | | | lockfile: rename LOCK_NODEREF to LOCK_NO_DEREFMichael Haggerty2014-10-014-5/+5
| * | | | | | commit_lock_file_to(): refactor a helper out of commit_lock_file()Michael Haggerty2014-10-014-38/+50
| * | | | | | trim_last_path_component(): replace last_path_elm()Michael Haggerty2014-10-011-22/+16
| * | | | | | resolve_symlink(): take a strbuf parameterMichael Haggerty2014-10-011-35/+22
| * | | | | | resolve_symlink(): use a strbuf for internal scratch spaceMichael Haggerty2014-10-011-21/+12
| * | | | | | lockfile: change lock_file::filename into a strbufMichael Haggerty2014-10-018-52/+47
| * | | | | | commit_lock_file(): use a strbuf to manage temporary spaceMichael Haggerty2014-10-011-5/+7
| * | | | | | try_merge_strategy(): use a statically-allocated lock_file objectMichael Haggerty2014-10-011-7/+7
| * | | | | | try_merge_strategy(): remove redundant lock_file allocationMichael Haggerty2014-10-011-1/+0
| * | | | | | struct lock_file: declare some fields volatileMichael Haggerty2014-10-012-4/+4
| * | | | | | lockfile: avoid transitory invalid statesMichael Haggerty2014-10-013-11/+28
| * | | | | | git_config_set_multivar_in_file(): avoid call to rollback_lock_file()Michael Haggerty2014-10-011-0/+1
| * | | | | | dump_marks(): remove a redundant call to rollback_lock_file()Michael Haggerty2014-10-011-3/+1
| * | | | | | api-lockfile: document edge casesMichael Haggerty2014-10-011-6/+14
| * | | | | | commit_lock_file(): rollback lock file on failure to renameMichael Haggerty2014-10-011-1/+6
| * | | | | | close_lock_file(): if close fails, roll backMichael Haggerty2014-10-012-13/+22
| * | | | | | commit_lock_file(): die() if called for unlocked lockfile objectMichael Haggerty2014-10-012-1/+5
| * | | | | | commit_lock_file(): inline temporary variableMichael Haggerty2014-10-011-3/+5
| * | | | | | remove_lock_file(): call rollback_lock_file()Michael Haggerty2014-10-011-6/+2
| * | | | | | lock_file(): exit early if lockfile cannot be openedMichael Haggerty2014-10-011-12/+11
| * | | | | | prepare_index(): declare return value to be (const char *)Michael Haggerty2014-10-011-2/+2
| * | | | | | delete_ref_loose(): don't muck around in the lock_file's filenameMichael Haggerty2014-10-011-6/+9
| * | | | | | cache.h: define constants LOCK_SUFFIX and LOCK_SUFFIX_LENMichael Haggerty2014-10-013-8/+14
| * | | | | | lockfile.c: document the various states of lock_file objectsMichael Haggerty2014-10-011-0/+42
| * | | | | | lock_file(): always initialize and register lock_file objectMichael Haggerty2014-10-011-9/+16
| * | | | | | hold_lock_file_for_append(): release lock on errorsMichael Haggerty2014-10-011-2/+2