summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/git-path'Junio C Hamano2015-08-1930-363/+465
|\
| * memoize common git-path "constant" filesjk/git-pathJeff King2015-08-1017-119/+151
| * get_repo_path: refactor path-allocationJeff King2015-08-101-14/+29
| * find_hook: keep our own static bufferJeff King2015-08-102-4/+11
| * refs.c: remove_empty_directories can take a strbufJeff King2015-08-101-19/+15
| * refs.c: avoid git_path assignment in lock_ref_sha1_basicJeff King2015-08-101-13/+19
| * refs.c: avoid repeated git_path calls in rename_tmp_logJeff King2015-08-101-7/+14
| * refs.c: simplify strbufs in reflog setup and writingJeff King2015-08-101-23/+15
| * path.c: drop git_path_submoduleJeff King2015-08-102-13/+2
| * refs.c: remove extra git_path calls from read_loose_refsJeff King2015-08-101-10/+13
| * remote.c: drop extraneous local variable from migrate_fileJeff King2015-08-101-5/+2
| * prefer mkpathdup to mkpath in assignmentsJeff King2015-08-102-13/+17
| * prefer git_pathdup to git_path in some possibly-dangerous casesJeff King2015-08-106-11/+21
| * add_to_alternates_file: don't add duplicate entriesJeff King2015-08-102-7/+45
| * t5700: modernize styleJeff King2015-08-101-112/+81
| * cache.h: complete set of git_path_submodule helpersJeff King2015-08-102-5/+35
| * cache.h: clarify documentation for git_path, et alJeff King2015-08-101-5/+12
* | Merge branch 'jc/finalize-temp-file'Junio C Hamano2015-08-195-15/+12
|\ \
| * | sha1_file.c: rename move_temp_to_file() to finalize_object_file()jc/finalize-temp-fileJunio C Hamano2015-08-105-15/+12
* | | Merge branch 'ps/guess-repo-name-at-root'Junio C Hamano2015-08-192-19/+61
|\ \ \
| * | | clone: abort if no dir name could be guessedps/guess-repo-name-at-rootPatrick Steinhardt2015-08-101-0/+4
| * | | clone: do not use port number as dir namePatrick Steinhardt2015-08-102-7/+24
| * | | clone: do not include authentication data in guessed dirPatrick Steinhardt2015-08-102-12/+33
* | | | Merge branch 'jk/guess-repo-name-regression-fix'Junio C Hamano2015-08-192-1/+108
|\ \ \ \ | |/ / /
| * | | clone: use computed length in guess_dir_namejk/guess-repo-name-regression-fixJeff King2015-08-102-7/+8
| * | | clone: add tests for output directoryJeff King2015-08-101-0/+106
* | | | Merge branch 'jk/negative-hiderefs'Junio C Hamano2015-08-193-22/+56
|\ \ \ \
| * | | | refs: support negative transfer.hideRefsjk/negative-hiderefsJeff King2015-08-073-5/+41
| * | | | docs/config.txt: reorder hideRefs configJeff King2015-07-281-17/+15
* | | | | Merge branch 'jk/test-with-x'Junio C Hamano2015-08-191-2/+11
|\ \ \ \ \
| * | | | | test-lib: disable trace when test is not verbosejk/test-with-xJeff King2015-08-071-2/+6
| * | | | | test-lib: turn off "-x" tracing during chain-lint checkJeff King2015-08-071-0/+5
* | | | | | Merge branch 'ps/t1509-chroot-test-fixup'Junio C Hamano2015-08-191-4/+4
|\ \ \ \ \ \
| * | | | | | tests: fix cleanup after tests in t1509-root-worktreeps/t1509-chroot-test-fixupPatrick Steinhardt2015-08-051-1/+1
| * | | | | | tests: fix broken && chains in t1509-root-worktreePatrick Steinhardt2015-08-051-4/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'sb/check-return-from-read-ref'Junio C Hamano2015-08-191-2/+6
|\ \ \ \ \ \
| * | | | | | transport-helper: die on errors reading refs.sb/check-return-from-read-refStefan Beller2015-08-031-2/+6
* | | | | | | Merge branch 'mm/pull-upload-pack'Junio C Hamano2015-08-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | pull.sh: quote $upload_pack when passing it to git-fetchMatthieu Moy2015-07-301-1/+1
* | | | | | | | Third batch for 2.6Junio C Hamano2015-08-171-0/+11
* | | | | | | | Merge branch 'dt/untracked-sparse'Junio C Hamano2015-08-172-14/+122
|\ \ \ \ \ \ \ \
| * | | | | | | | untracked-cache: support sparse checkoutDavid Turner2015-07-312-14/+122
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ta/docfix-index-format-tech'Junio C Hamano2015-08-171-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | typofix for index-format.txtta/docfix-index-format-techThomas Ackermann2015-07-281-1/+1
* | | | | | | | | Merge branch 'mh/get-remote-group-fix'Junio C Hamano2015-08-171-8/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | get_remote_group(): use skip_prefix()mh/get-remote-group-fixMichael Haggerty2015-07-281-2/+1
| * | | | | | | | | get_remote_group(): eliminate superfluous call to strcspn()Michael Haggerty2015-07-281-2/+2
| * | | | | | | | | get_remote_group(): rename local variable "space" to "wordlen"Michael Haggerty2015-07-281-5/+5
| * | | | | | | | | get_remote_group(): handle remotes with single-character namesMichael Haggerty2015-07-281-2/+1
* | | | | | | | | | Merge branch 'kd/pull-rebase-autostash'Junio C Hamano2015-08-172-1/+16
|\ \ \ \ \ \ \ \ \ \