summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sp/maint-dumb-http-pack-reidx'Junio C Hamano2010-05-218-60/+149
|\
| * http.c::new_http_pack_request: do away with the temp variable filenameTay Ray Chuan2010-04-191-3/+2
| * http-fetch: Use temporary files for pack-*.idx until verifiedShawn O. Pearce2010-04-192-17/+54
| * http-fetch: Use index-pack rather than verify-pack to check packsShawn O. Pearce2010-04-192-7/+52
| * Allow parse_pack_index on temporary filesShawn O. Pearce2010-04-193-4/+3
| * Extract verify_pack_index for reuse from verify_packShawn O. Pearce2010-04-192-3/+13
| * Introduce close_pack_index to permit replacementShawn O. Pearce2010-04-192-2/+10
| * http.c: Remove unnecessary strdup of sha1_to_hex resultShawn O. Pearce2010-04-191-4/+2
| * http.c: Don't store destination name in request structuresShawn O. Pearce2010-04-173-11/+7
| * http.c: Drop useless != NULL test in finish_http_pack_requestShawn O. Pearce2010-04-171-6/+3
| * http.c: Tiny refactoring of finish_http_pack_requestShawn O. Pearce2010-04-171-8/+8
| * t5550-http-fetch: Use subshell for repository operationsShawn O. Pearce2010-04-171-3/+4
| * http.c: Remove bad free of static blockShawn O. Pearce2010-04-171-1/+0
* | Merge branch 'jn/submodule-basic-test'Junio C Hamano2010-05-211-130/+201
|\ \
| * | t7400: clarify submodule update testsJonathan Nieder2010-04-101-95/+91
| * | t7400: clarify 'submodule add' testsJonathan Nieder2010-04-101-15/+88
| * | t7400: split setup into multiple testsJonathan Nieder2010-04-101-28/+30
* | | Merge branch 'np/index-pack-memsave'Junio C Hamano2010-05-211-44/+45
|\ \ \
| * | | index-pack: smarter memory usage when appending objectsNicolas Pitre2010-04-121-12/+12
| * | | index-pack: rationalize unpack_entry_data()Nicolas Pitre2010-04-121-11/+8
| * | | index-pack: smarter memory usage when resolving deltasNicolas Pitre2010-04-121-21/+25
* | | | Merge branch 'jc/am-3-show-corrupted-patch'Junio C Hamano2010-05-211-1/+1
|\ \ \ \
| * | | | am -3: recover the diagnostic messages for corrupt patchesJunio C Hamano2010-04-141-1/+1
* | | | | Merge branch 'jc/maint-no-reflog-expire-unreach-for-head'Junio C Hamano2010-05-215-19/+92
|\ \ \ \ \
| * | | | | reflog --expire-unreachable: special case entries in "HEAD" reflogJunio C Hamano2010-04-171-10/+59
| * | | | | more war on "sleep" in testsJunio C Hamano2010-04-172-7/+15
| * | | | | Document gc.<pattern>.reflogexpire variablesJunio C Hamano2010-04-142-2/+18
* | | | | | Merge branch 'cw/maint-exec-defpath'Junio C Hamano2010-05-215-1/+28
|\ \ \ \ \ \
| * | | | | | autoconf: Check if <paths.h> exists and set HAVE_PATHS_HJakub Narebski2010-04-152-0/+7
| * | | | | | exec_cmd.c: replace hard-coded path list with one from <paths.h>Chris Webb2010-04-153-1/+21
* | | | | | | Merge branch 'tr/word-diff'Junio C Hamano2010-05-217-54/+288
|\ \ \ \ \ \ \
| * | | | | | | diff: add --word-diff option that generalizes --color-wordsThomas Rast2010-04-147-54/+288
* | | | | | | | Merge branch 'sp/maint-describe-tiebreak-with-tagger-date'Junio C Hamano2010-05-214-33/+97
|\ \ \ \ \ \ \ \
| * | | | | | | | describe: Break annotated tag ties by tagger dateShawn O. Pearce2010-04-132-7/+50
| * | | | | | | | tag.c: Parse tagger date (if present)Shawn O. Pearce2010-04-122-0/+23
| * | | | | | | | tag.c: Refactor parse_tag_buffer to be saner to programShawn O. Pearce2010-04-121-22/+21
| * | | | | | | | tag.h: Remove unused signature fieldShawn O. Pearce2010-04-121-1/+0
| * | | | | | | | tag.c: Correct indentationShawn O. Pearce2010-04-121-3/+3
* | | | | | | | | Merge branch 'jc/status-show-ignored'Junio C Hamano2010-05-213-18/+55
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | wt-status: fix 'fprintf' compilation warningJunio C Hamano2010-05-011-1/+1
| * | | | | | | | | status: --ignored option shows ignored filesJunio C Hamano2010-04-102-8/+20
| * | | | | | | | | wt-status: rename and restructure status-print-untrackedJunio C Hamano2010-04-101-8/+14
| * | | | | | | | | wt-status: collect ignored filesJunio C Hamano2010-04-102-0/+18
| * | | | | | | | | wt-status: plug memory leak while collecting untracked filesJunio C Hamano2010-04-101-0/+3
| * | | | | | | | | wt-status: remove unused workdir_untracked memberJunio C Hamano2010-04-102-2/+0
* | | | | | | | | | Merge branch 'np/malloc-threading'Junio C Hamano2010-05-217-8/+54
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Thread-safe xmalloc and xrealloc needs a recursive mutexJohannes Sixt2010-04-085-4/+27
| * | | | | | | | | | Make xmalloc and xrealloc thread-safeNicolas Pitre2010-03-243-4/+27
* | | | | | | | | | | Merge branch 'sr/remote-helper-export'Junio C Hamano2010-05-2111-27/+671
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | t5800: testgit helper requires Python supportJonathan Nieder2010-04-121-0/+6