summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'mh/split-under-lock'Junio C Hamano2016-07-2510-260/+1016
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | lock_ref_sha1_basic(): only handle REF_NODEREF modemh/split-under-lockMichael Haggerty2016-06-131-34/+20
| * | | | | | | | commit_ref_update(): remove the flags parameterMichael Haggerty2016-06-131-7/+7
| * | | | | | | | lock_ref_for_update(): don't resolve symrefsMichael Haggerty2016-06-132-30/+95
| * | | | | | | | lock_ref_for_update(): don't re-read non-symbolic referencesMichael Haggerty2016-06-131-18/+30
| * | | | | | | | refs: resolve symbolic refs firstMichael Haggerty2016-06-133-40/+514
| * | | | | | | | ref_transaction_update(): check refname_is_safe() at a minimumMichael Haggerty2016-06-133-4/+5
| * | | | | | | | unlock_ref(): move definition higher in the fileMichael Haggerty2016-06-131-10/+10
| * | | | | | | | lock_ref_for_update(): new functionMichael Haggerty2016-06-131-67/+85
| * | | | | | | | add_update(): initialize the whole ref_updateMichael Haggerty2016-06-132-22/+40
| * | | | | | | | verify_refname_available(): adjust constness in declarationMichael Haggerty2016-06-132-4/+4
| * | | | | | | | refs: don't dereference on renameDavid Turner2016-06-132-5/+25
| * | | | | | | | refs: allow log-only updatesDavid Turner2016-06-132-6/+17
| * | | | | | | | delete_branches(): use resolve_refdup()Michael Haggerty2016-06-131-8/+11
| * | | | | | | | ref_transaction_commit(): correctly report close_ref() failureMichael Haggerty2016-06-131-0/+1
| * | | | | | | | ref_transaction_create(): disallow recursive pruningMichael Haggerty2016-06-133-2/+5
| * | | | | | | | refs: make error messages more consistentMichael Haggerty2016-06-133-22/+22
| * | | | | | | | lock_ref_sha1_basic(): remove unneeded local variableMichael Haggerty2016-06-131-6/+3
| * | | | | | | | read_raw_ref(): move docstring to header fileMichael Haggerty2016-06-132-38/+38
| * | | | | | | | read_raw_ref(): improve docstringMichael Haggerty2016-06-131-17/+24
| * | | | | | | | read_raw_ref(): rename symref argument to referentMichael Haggerty2016-06-132-11/+12
| * | | | | | | | read_raw_ref(): clear *type at start of functionMichael Haggerty2016-06-131-0/+1
| * | | | | | | | read_raw_ref(): rename flags argument to typeMichael Haggerty2016-06-132-10/+10
| * | | | | | | | ref_transaction_commit(): remove local variables n and updatesMichael Haggerty2016-06-131-22/+20
| * | | | | | | | rename_ref(): remove unneeded local variableMichael Haggerty2016-05-051-6/+3
| * | | | | | | | commit_ref_update(): write error message to *err, not stderrMichael Haggerty2016-05-051-1/+1
| * | | | | | | | refname_is_safe(): insist that the refname already be normalizedMichael Haggerty2016-05-051-2/+7
| * | | | | | | | refname_is_safe(): don't allow the empty stringMichael Haggerty2016-05-051-2/+3
| * | | | | | | | refname_is_safe(): use skip_prefix()Michael Haggerty2016-05-051-3/+5
| * | | | | | | | remove_dir_recursively(): add docstringMichael Haggerty2016-05-051-0/+23
| * | | | | | | | safe_create_leading_directories(): improve docstringMichael Haggerty2016-05-051-0/+5
| * | | | | | | | read_raw_ref(): don't get confused by an empty directoryMichael Haggerty2016-05-052-2/+11
| * | | | | | | | commit_ref(): if there is an empty dir in the way, delete itMichael Haggerty2016-05-051-0/+24
| * | | | | | | | t1404: demonstrate a bug resolving referencesMichael Haggerty2016-05-051-1/+75
* | | | | | | | | Sixth batch of topics for 2.10Junio C Hamano2016-07-191-0/+70
* | | | | | | | | Merge branch 'ls/p4-tmp-refs'Junio C Hamano2016-07-192-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | git-p4: place temporary refs used for branch import under refs/git-p4-tmpls/p4-tmp-refsLars Schneider2016-07-082-3/+3
* | | | | | | | | | Merge branch 'js/am-call-theirs-theirs-in-fallback-3way'Junio C Hamano2016-07-191-8/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | am: counteract gender biasjs/am-call-theirs-theirs-in-fallback-3wayJohannes Schindelin2016-07-081-8/+8
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/write-file'Junio C Hamano2016-07-196-102/+44
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | branch: use write_file_buf instead of write_filejk/write-fileJeff King2016-07-081-1/+1
| * | | | | | | | | | use write_file_buf where applicableJeff King2016-07-082-46/+6
| * | | | | | | | | | write_file: add format attributeJeff King2016-07-081-0/+8
| * | | | | | | | | | write_file: add pointer+len variantJeff King2016-07-082-5/+17
| * | | | | | | | | | write_file: use xopenJeff King2016-07-081-3/+1
| * | | | | | | | | | write_file: drop "gently" formJeff King2016-07-082-45/+12
| * | | | | | | | | | branch: use non-gentle write_file for branch descriptionJeff King2016-07-081-4/+1
| * | | | | | | | | | am: ignore return value of write_file()René Scharfe2016-07-081-9/+9
| * | | | | | | | | | config: fix bogus fd check when setting up default configJeff King2016-07-081-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'jk/printf-format'Junio C Hamano2016-07-196-20/+14
|\ \ \ \ \ \ \ \ \ \