summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* lockfile: remove function "hold_lock_file_for_append"rt/remove-hold-lockfile-for-appendRalf Thielow2015-08-282-57/+7
* Merge branch 'mh/tempfile'Junio C Hamano2015-08-2518-630/+969
|\
| * credential-cache--daemon: use tempfile modulemh/tempfileMichael Haggerty2015-08-121-20/+6
| * credential-cache--daemon: delete socket from main()Michael Haggerty2015-08-121-1/+2
| * gc: use tempfile module to handle gc.pid fileMichael Haggerty2015-08-121-20/+5
| * lock_repo_for_gc(): compute the path to "gc.pid" only onceMichael Haggerty2015-08-121-3/+6
| * diff: use tempfile moduleMichael Haggerty2015-08-121-23/+23
| * setup_temporary_shallow(): use tempfile moduleMichael Haggerty2015-08-101-28/+7
| * write_shared_index(): use tempfile moduleMichael Haggerty2015-08-101-32/+6
| * register_tempfile(): new function to handle an existing temporary fileMichael Haggerty2015-08-102-0/+16
| * tempfile: add several functions for creating temporary filesMichael Haggerty2015-08-102-0/+149
| * prepare_tempfile_object(): new function, extracted from create_tempfile()Michael Haggerty2015-08-101-7/+13
| * tempfile: a new module for handling temporary filesMichael Haggerty2015-08-105-270/+470
| * commit_lock_file(): use get_locked_file_path()Michael Haggerty2015-08-101-16/+12
| * lockfile: add accessor get_lock_file_path()Michael Haggerty2015-08-106-20/+34
| * lockfile: add accessors get_lock_file_fd() and get_lock_file_fp()Michael Haggerty2015-08-105-7/+26
| * create_bundle(): duplicate file descriptor to avoid closing it twiceMichael Haggerty2015-08-101-10/+16
| * lockfile: move documentation to lockfile.h and lockfile.cMichael Haggerty2015-08-103-280/+283
* | Merge branch 'pt/am-builtin-options'Junio C Hamano2015-08-253-10/+166
|\ \
| * | am: let --signoff override --no-signoffpt/am-builtin-optionsPaul Tan2015-08-122-3/+45
| * | am: let command-line options override saved optionsPaul Tan2015-08-122-4/+94
| * | test_terminal: redirect child process' stdin to a ptyPaul Tan2015-08-121-4/+28
* | | Merge branch 'dt/refs-pseudo'Junio C Hamano2015-08-255-56/+163
|\ \ \
| * | | pseudoref: check return values from read_ref()dt/refs-pseudoDavid Turner2015-08-111-2/+5
| * | | sequencer: replace write_cherry_pick_head with update_refDavid Turner2015-07-311-19/+4
| * | | bisect: use update_refDavid Turner2015-07-311-29/+8
| * | | pseudorefs: create and use pseudoref update and delete functionsDavid Turner2015-07-311-8/+93
| * | | refs: add ref_type functionDavid Turner2015-07-312-0/+34
| * | | refs: introduce pseudoref and per-worktree ref conceptsDavid Turner2015-07-311-0/+21
* | | | Merge branch 'dt/notes-multiple'Junio C Hamano2015-08-254-12/+120
|\ \ \ \
| * | | | notes: handle multiple worktreesdt/notes-multipleDavid Turner2015-08-112-0/+78
| * | | | worktrees: add find_shared_symrefDavid Turner2015-08-112-12/+42
* | | | | Merge branch 'nd/dwim-wildcards-as-pathspecs'Junio C Hamano2015-08-251-1/+1
|\ \ \ \ \
| * | | | | t2019: skip test requiring '*' in a file name non WindowsJohannes Sixt2015-08-111-1/+1
* | | | | | Merge branch 'jk/long-error-messages'Junio C Hamano2015-08-253-29/+21
|\ \ \ \ \ \
| * | | | | | vreportf: avoid intermediate bufferjk/long-error-messagesJeff King2015-08-111-3/+12
| * | | | | | vreportf: report to arbitrary filehandlesJeff King2015-08-113-29/+12
* | | | | | | Merge branch 'ee/clean-remove-dirs'Junio C Hamano2015-08-251-1/+1
|\ \ \ \ \ \ \
| * | | | | | | t7300-clean: require POSIXPERM for chmod 0 testee/clean-remove-dirsJohannes Sixt2015-08-111-1/+1
* | | | | | | | Merge branch 'jh/strbuf-read-use-read-in-full'Junio C Hamano2015-08-251-5/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | strbuf_read(): skip unnecessary strbuf_grow() at eofjh/strbuf-read-use-read-in-fullJim Hill2015-08-101-5/+5
* | | | | | | | | Sync with maintJunio C Hamano2015-08-191-0/+49
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Start preparing for 2.5.1Junio C Hamano2015-08-192-1/+50
| * | | | | | | | | Merge branch 'ta/docfix-index-format-tech' into maintJunio C Hamano2015-08-191-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'sb/parse-options-codeformat' into maintJunio C Hamano2015-08-191-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'sb/remove-unused-var-from-builtin-add' into maintJunio C Hamano2015-08-191-2/+0
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kn/tag-doc-fix' into maintJunio C Hamano2015-08-191-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'es/doc-clean-outdated-tools' into maintJunio C Hamano2015-08-192-117/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/export-worktree' into maintJunio C Hamano2015-08-192-0/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mh/fast-import-optimize-current-from' into maintJunio C Hamano2015-08-191-12/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status