summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kw/commit-keep-index-when-pre-commit-is-not-run'Junio C Hamano2017-08-231-6/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | commit: skip discarding the index if there is no pre-commit hookkw/commit-keep-index-when-pre-commit-is-not-runKevin Willford2017-08-161-6/+9
| |/ / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sb/sha1-file-cleanup'Junio C Hamano2017-08-232-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | sha1_file: make read_info_alternates staticsb/sha1-file-cleanupStefan Beller2017-08-152-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rs/t1002-do-not-use-sum'Junio C Hamano2017-08-232-35/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | t1002: stop using sum(1)rs/t1002-do-not-use-sumRené Scharfe2017-08-152-35/+35
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kd/stash-with-bash-4.4'Junio C Hamano2017-08-231-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | stash: prevent warning about null bytes in inputkd/stash-with-bash-4.4Kevin Daudt2017-08-141-2/+9
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ah/doc-empty-string-is-false'Junio C Hamano2017-08-232-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | doc: clarify "config --bool" behaviour with empty stringah/doc-empty-string-is-falseAndreas Heiduk2017-08-142-6/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kw/rebase-progress'Junio C Hamano2017-08-234-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | rebase: turn on progress option by default for format-patchkw/rebase-progressKevin Willford2017-08-142-0/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: have progress option while generating patchesKevin Willford2017-08-142-0/+14
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ks/prepare-commit-msg-sample-fix'Junio C Hamano2017-08-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | hook: use correct logical variableks/prepare-commit-msg-sample-fixKaartic Sivaraam2017-08-141-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nm/stash-untracked'Junio C Hamano2017-08-232-5/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | stash: clean untracked files before resetnm/stash-untrackedNicolas Morey-Chaisemartin2017-08-112-5/+23
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jt/sha1-file-cleanup'Junio C Hamano2017-08-231-32/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | sha1_file: remove read_packed_sha1()jt/sha1-file-cleanupJonathan Tan2017-08-111-25/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | sha1_file: set whence in storage-specific info fnJonathan Tan2017-08-111-7/+6
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | The second batch post 2.14Junio C Hamano2017-08-221-0/+57
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'mh/packed-ref-store'Junio C Hamano2017-08-228-564/+1098
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | files-backend: cheapen refname_available check when locking refsmh/packed-ref-storeMichael Haggerty2017-08-171-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | packed_ref_store: handle a packed-refs file that is a symlinkMichael Haggerty2017-07-272-6/+33
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | read_packed_refs(): die if `packed-refs` contains bogus dataMichael Haggerty2017-07-032-6/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | t3210: add some tests of bogus packed-refs file contentsMichael Haggerty2017-07-031-0/+27
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | repack_without_refs(): don't lock or unlock the packed refsMichael Haggerty2017-07-032-40/+39
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit_packed_refs(): remove call to `packed_refs_unlock()`Michael Haggerty2017-06-232-10/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | clear_packed_ref_cache(): don't protest if the lock is heldMichael Haggerty2017-06-231-2/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | packed_refs_unlock(), packed_refs_is_locked(): new functionsMichael Haggerty2017-06-232-6/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | packed_refs_lock(): report errors via a `struct strbuf *err`Michael Haggerty2017-06-233-13/+16
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | packed_refs_lock(): function renamed from lock_packed_refs()Michael Haggerty2017-06-233-8/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit_packed_refs(): use a staging file separate from the lockfileMichael Haggerty2017-06-231-8/+32
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit_packed_refs(): report errors rather than dyingMichael Haggerty2017-06-233-36/+61
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | packed_ref_store: make class into a subclass of `ref_store`Michael Haggerty2017-06-234-45/+227
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | packed-backend: new module for handling packed referencesMichael Haggerty2017-06-236-639/+685
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | packed_read_raw_ref(): new function, replacing `resolve_packed_ref()`Michael Haggerty2017-06-231-19/+17
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | packed_ref_store: support iterationMichael Haggerty2017-06-231-9/+110
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | packed_peel_ref(): new function, extracted from `files_peel_ref()`Michael Haggerty2017-06-231-11/+15
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | repack_without_refs(): take a `packed_ref_store *` parameterMichael Haggerty2017-06-231-10/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_packed_ref(): take a `packed_ref_store *` parameterMichael Haggerty2017-06-231-5/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | rollback_packed_refs(): take a `packed_ref_store *` parameterMichael Haggerty2017-06-231-8/+7
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit_packed_refs(): take a `packed_ref_store *` parameterMichael Haggerty2017-06-231-9/+9
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | lock_packed_refs(): take a `packed_ref_store *` parameterMichael Haggerty2017-06-231-9/+22
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | add_packed_ref(): take a `packed_ref_store *` parameterMichael Haggerty2017-06-231-5/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_packed_refs(): take a `packed_ref_store *` parameterMichael Haggerty2017-06-231-5/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_packed_ref_cache(): take a `packed_ref_store *` parameterMichael Haggerty2017-06-231-14/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | validate_packed_ref_cache(): take a `packed_ref_store *` parameterMichael Haggerty2017-06-231-7/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | clear_packed_ref_cache(): take a `packed_ref_store *` parameterMichael Haggerty2017-06-231-8/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | packed_ref_store: move `packed_refs_lock` member hereMichael Haggerty2017-06-231-15/+16