summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/alloc-commit-id'Junio C Hamano2014-07-2211-89/+103
|\
| * diff-tree: avoid lookup_unknown_objectjk/alloc-commit-idJeff King2014-07-131-3/+1
| * object_as_type: set commit indexJeff King2014-07-131-0/+2
| * alloc: factor out commit indexJeff King2014-07-132-2/+8
| * add object_as_type helper for casting objectsJeff King2014-07-137-43/+25
| * parse_object_buffer: do not set object typeJeff King2014-07-131-2/+0
| * move setting of object->type to alloc_* functionsJeff King2014-07-138-12/+13
| * alloc: write out allocator definitionsJeff King2014-07-131-11/+27
| * alloc.c: remove the alloc_raw_commit_node() functionRamsay Jones2014-07-131-18/+29
* | Merge branch 'kb/perf-trace'Junio C Hamano2014-07-2217-176/+629
|\ \
| * | api-trace.txt: add trace API documentationKarsten Blees2014-07-131-0/+97
| * | progress: simplify performance measurement by using getnanotime()Karsten Blees2014-07-131-35/+36
| * | wt-status: simplify performance measurement by using getnanotime()Karsten Blees2014-07-131-11/+3
| * | git: add performance tracing for git's main() function to debug scriptsKarsten Blees2014-07-134-0/+30
| * | trace: add trace_performance facility to debug performance issuesKarsten Blees2014-07-132-0/+65
| * | trace: add high resolution timer function to debug performance issuesKarsten Blees2014-07-134-0/+91
| * | trace: add 'file:line' to all trace outputKarsten Blees2014-07-133-12/+126
| * | trace: move code around, in preparation to file:line outputKarsten Blees2014-07-132-22/+26
| * | trace: add current timestamp to all trace outputKarsten Blees2014-07-131-1/+9
| * | trace: disable additional trace output for unit testsKarsten Blees2014-07-132-0/+10
| * | trace: add infrastructure to augment trace output with additional infoKarsten Blees2014-07-132-15/+34
| * | sha1_file: change GIT_TRACE_PACK_ACCESS logging to use trace APIKarsten Blees2014-07-132-28/+6
| * | Documentation/git.txt: improve documentation of 'GIT_TRACE*' variablesKarsten Blees2014-07-131-16/+34
| * | trace: improve trace performanceKarsten Blees2014-07-136-59/+78
| * | trace: remove redundant printf format attributeKarsten Blees2014-06-171-1/+0
| * | trace: consistently name the format parameterKarsten Blees2014-06-172-12/+12
| * | trace: move trace declarations from cache.h to new trace.hKarsten Blees2014-06-172-11/+19
* | | Merge branch 'maint'Junio C Hamano2014-07-2110-27/+10
|\ \ \
| * | | use xmemdupz() to allocate copies of strings given by start and lengthRené Scharfe2014-07-216-19/+6
| * | | use xcalloc() to allocate zero-initialized memoryRené Scharfe2014-07-214-8/+4
* | | | Ninth batch for 2.1Junio C Hamano2014-07-211-0/+4
* | | | Merge branch 'rs/unify-is-branch'Junio C Hamano2014-07-213-6/+3
|\ \ \ \
| * | | | refs.c: add a public is_branch functionrs/unify-is-branchRonnie Sahlberg2014-07-163-6/+3
| |/ / /
* | | | Merge branch 'kb/avoid-fchmod-for-now'Junio C Hamano2014-07-211-4/+4
|\ \ \ \
| * | | | config: use chmod() instead of fchmod()kb/avoid-fchmod-for-nowKarsten Blees2014-07-161-4/+4
* | | | | Merge branch 'sk/mingw-uni-fix'Junio C Hamano2014-07-214-77/+171
|\ \ \ \ \
| * | | | | Win32: Unicode file name support (dirent)sk/mingw-uni-fixKarsten Blees2014-07-152-21/+11
| * | | | | Win32: Unicode file name support (except dirent)Karsten Blees2014-07-152-56/+160
* | | | | | Merge branch 'ek/alt-odb-entry-fix'Junio C Hamano2014-07-212-4/+33
|\ \ \ \ \ \
| * | | | | | sha1_file: do not add own object directory as alternateek/alt-odb-entry-fixEphrim Khong2014-07-152-4/+33
* | | | | | | Merge branch 'kb/hashmap-updates'Junio C Hamano2014-07-2112-61/+159
|\ \ \ \ \ \ \
| * | | | | | | hashmap: add string interning APIkb/hashmap-updatesKarsten Blees2014-07-075-0/+88
| * | | | | | | hashmap: add simplified hashmap_get_from_hash() APIKarsten Blees2014-07-076-18/+31
| * | | | | | | hashmap: improve struct hashmap member documentationKarsten Blees2014-07-071-4/+12
| * | | | | | | hashmap: factor out getting a hash code from a SHA1Karsten Blees2014-07-078-40/+29
* | | | | | | | Merge branch 'jk/remote-curl-squelch-extra-errors'Junio C Hamano2014-07-211-8/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | remote-curl: mark helper-protocol errors more clearlyjk/remote-curl-squelch-extra-errorsJeff King2014-07-101-4/+4
| * | | | | | | | remote-curl: use error instead of fprintf(stderr)Jeff King2014-07-101-5/+5
| * | | | | | | | remote-curl: do not complain on EOF from parent gitJeff King2014-07-101-2/+0
* | | | | | | | | Merge branch 'rs/ref-transaction-0'Junio C Hamano2014-07-216-100/+199
|\ \ \ \ \ \ \ \ \