summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/config-ignore-inaccessible'Junio C Hamano2013-05-295-15/+22
|\
| * config: allow inaccessible configuration under $HOMEJonathan Nieder2013-04-155-15/+22
* | Merge branch 'jk/lookup-object-prefer-latest'Junio C Hamano2013-05-291-2/+12
|\ \
| * | lookup_object: prioritize recently found objectsJeff King2013-05-021-2/+12
* | | Merge branch 'jk/subtree-do-not-push-if-split-fails'Junio C Hamano2013-05-291-1/+2
|\ \ \
| * | | contrib/subtree: don't delete remote branches if split failsJohn Keeping2013-05-011-1/+2
* | | | Merge branch 'jk/test-output'Junio C Hamano2013-05-294-7/+21
|\ \ \ \
| * | | | t/Makefile: don't define TEST_RESULTS_DIRECTORY recursivelyJohn Keeping2013-05-061-1/+1
| * | | | test output: respect $TEST_OUTPUT_DIRECTORYJohn Keeping2013-04-293-4/+11
| * | | | t/Makefile: fix result handling with TEST_OUTPUT_DIRECTORYJohn Keeping2013-04-271-3/+10
* | | | | Merge branch 'rj/sparse'Junio C Hamano2013-05-2920-30/+43
|\ \ \ \ \
| * | | | | sparse: Fix mingw_main() argument number/type errorsRamsay Jones2013-04-2810-15/+16
| * | | | | compat/mingw.c: Fix some sparse warningsRamsay Jones2013-04-282-3/+10
| * | | | | compat/win32mmap.c: Fix some sparse warningsRamsay Jones2013-04-281-2/+2
| * | | | | compat/poll/poll.c: Fix a sparse warningRamsay Jones2013-04-281-1/+1
| * | | | | compat/win32/pthread.c: Fix a sparse warningRamsay Jones2013-04-281-1/+1
| * | | | | compat/unsetenv.c: Fix a sparse warningRamsay Jones2013-04-281-1/+0
| * | | | | compat/nedmalloc: Fix compiler warnings on linuxRamsay Jones2013-04-281-0/+4
| * | | | | compat/nedmalloc: Fix some sparse warningsRamsay Jones2013-04-283-3/+4
| * | | | | compat/fnmatch/fnmatch.c: Fix a sparse errorRamsay Jones2013-04-281-1/+2
| * | | | | compat/regex/regexec.c: Fix some sparse warningsRamsay Jones2013-04-281-3/+3
* | | | | | Merge branch 'mh/packed-refs-various'Junio C Hamano2013-05-299-341/+640
|\ \ \ \ \ \
| * | | | | | refs: handle the main ref_cache speciallyMichael Haggerty2013-05-011-29/+31
| * | | | | | refs: change do_for_each_*() functions to take ref_cache argumentsMichael Haggerty2013-05-011-15/+14
| * | | | | | pack_one_ref(): do some cheap tests before a more expensive oneMichael Haggerty2013-05-011-6/+5
| * | | | | | pack_one_ref(): use write_packed_entry() to do the writingMichael Haggerty2013-05-011-25/+8
| * | | | | | pack_one_ref(): use function peel_entry()Michael Haggerty2013-05-011-16/+23
| * | | | | | refs: inline function do_not_prune()Michael Haggerty2013-05-011-9/+2
| * | | | | | pack_refs(): change to use do_for_each_entry()Michael Haggerty2013-05-011-14/+15
| * | | | | | refs: use same lock_file object for both ref-packing functionsMichael Haggerty2013-05-011-6/+4
| * | | | | | pack_one_ref(): rename "path" parameter to "refname"Michael Haggerty2013-05-011-7/+7
| * | | | | | pack-refs: merge code from pack-refs.{c,h} into refs.{c,h}Michael Haggerty2013-05-017-170/+159
| * | | | | | pack-refs: rename handle_one_ref() to pack_one_ref()Michael Haggerty2013-05-011-2/+2
| * | | | | | refs: extract a function write_packed_entry()Michael Haggerty2013-05-011-16/+30
| * | | | | | repack_without_ref(): write peeled refs in the rewritten fileMichael Haggerty2013-05-012-1/+24
| * | | | | | t3211: demonstrate loss of peeled refs if a packed ref is deletedMichael Haggerty2013-05-011-0/+9
| * | | | | | refs: change how packed refs are deletedMichael Haggerty2013-05-011-16/+68
| * | | | | | search_ref_dir(): return an index rather than a pointerMichael Haggerty2013-05-011-12/+18
| * | | | | | repack_without_ref(): silence errors for dangling packed refsMichael Haggerty2013-05-012-3/+36
| * | | | | | t3210: test for spurious error messages for dangling packed refsMichael Haggerty2013-05-011-0/+33
| * | | | | | refs: change the internal reference-iteration APIMichael Haggerty2013-05-011-61/+83
| * | | | | | refs: extract a function peel_entry()Michael Haggerty2013-05-011-14/+49
| * | | | | | peel_ref(): fix return value for non-peelable, not-current referenceMichael Haggerty2013-05-012-1/+12
| * | | | | | peel_object(): give more specific information in return valueMichael Haggerty2013-05-011-8/+24
| * | | | | | refs: extract function peel_object()Michael Haggerty2013-05-011-20/+30
| * | | | | | refs: extract a function ref_resolves_to_object()Michael Haggerty2013-05-011-8/+20
| * | | | | | repack_without_ref(): use function get_packed_ref()Michael Haggerty2013-05-011-3/+5
| * | | | | | peel_ref(): use function get_packed_ref()Michael Haggerty2013-05-011-3/+2
| * | | | | | get_packed_ref(): return a ref_entryMichael Haggerty2013-05-011-11/+9
| * | | | | | do_for_each_ref_in_dirs(): remove dead codeMichael Haggerty2013-05-011-7/+0