summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* reflog_expire(): never update a reference to null_sha1mh/expire-updateref-fixesMichael Haggerty2015-03-051-2/+5
* reflog_expire(): ignore --updateref for symbolic referencesMichael Haggerty2015-03-052-4/+14
* reflog: improve and update documentationMichael Haggerty2015-03-052-64/+88
* struct ref_lock: delete the force_write memberStefan Beller2015-03-051-5/+9
* lock_ref_sha1_basic(): do not set force_write for missing referencesMichael Haggerty2015-03-051-9/+6
* write_ref_sha1(): move write elision test to callersMichael Haggerty2015-03-051-9/+9
* write_ref_sha1(): remove check for lock == NULLMichael Haggerty2015-03-051-4/+0
* Merge branch 'sb/atomic-push' into mh/ref-trans-value-checkJunio C Hamano2015-02-0913-50/+429
|\
| * Document receive.advertiseatomicStefan Beller2015-01-141-0/+5
| * t5543-atomic-push.sh: add basic tests for atomic pushesStefan Beller2015-01-071-0/+194
| * push.c: add an --atomic argumentRonnie Sahlberg2015-01-074-1/+13
| * send-pack.c: add --atomic command line argumentRonnie Sahlberg2015-01-076-6/+66
| * send-pack: rename ref_update_to_be_sent to check_to_send_updateStefan Beller2015-01-071-7/+11
| * receive-pack.c: negotiate atomic push supportRonnie Sahlberg2015-01-072-2/+22
| * receive-pack.c: add execute_commands_atomic functionStefan Beller2015-01-071-1/+46
| * receive-pack.c: move transaction handling in a central placeStefan Beller2015-01-071-14/+37
| * receive-pack.c: move iterating over all commands outside execute_commandsStefan Beller2015-01-071-6/+13
| * receive-pack.c: die instead of error in case of possible future bugStefan Beller2015-01-071-3/+1
| * receive-pack.c: shorten the execute_commands loop over all commandsStefan Beller2015-01-071-16/+27
* | Merge branch 'mh/reflog-expire' into mh/ref-trans-value-checkJunio C Hamano2015-02-093-265/+332
|\ \ | |/
| * refs.c: let fprintf handle the formattingmh/reflog-expireStefan Beller2014-12-221-5/+2
| * refs.c: don't expose the internal struct ref_lock in the header fileStefan Beller2014-12-222-9/+9
| * lock_any_ref_for_update(): inline functionMichael Haggerty2014-12-222-16/+2
| * refs.c: remove unlock_ref/close_ref/commit_ref from the refs apiRonnie Sahlberg2014-12-222-21/+12
| * reflog_expire(): new function in the reference APIMichael Haggerty2014-12-223-133/+190
| * expire_reflog(): treat the policy callback data as opaqueMichael Haggerty2014-12-121-36/+36
| * Move newlog and last_kept_sha1 to "struct expire_reflog_cb"Michael Haggerty2014-12-121-10/+10
| * expire_reflog(): move rewrite to flags argumentMichael Haggerty2014-12-121-5/+5
| * expire_reflog(): move verbose to flags argumentMichael Haggerty2014-12-121-8/+8
| * expire_reflog(): pass flags through to expire_reflog_ent()Michael Haggerty2014-12-121-0/+2
| * struct expire_reflog_cb: a new callback data typeMichael Haggerty2014-12-121-17/+26
| * Rename expire_reflog_cb to expire_reflog_policy_cbMichael Haggerty2014-12-121-9/+10
| * expire_reflog(): move updateref to flags argumentMichael Haggerty2014-12-121-6/+6
| * expire_reflog(): move dry_run to flags argumentMichael Haggerty2014-12-121-5/+8
| * expire_reflog(): add a "flags" argumentMichael Haggerty2014-12-121-4/+6
| * expire_reflog(): extract two policy-related functionsMichael Haggerty2014-12-121-42/+52
| * Extract function should_expire_reflog_ent()Michael Haggerty2014-12-121-28/+42
| * expire_reflog(): use a lock_file for rewriting the reflog fileMichael Haggerty2014-12-121-19/+41
| * expire_reflog(): return early if the reference has no reflogMichael Haggerty2014-12-121-3/+5
| * expire_reflog(): rename "ref" parameter to "refname"Michael Haggerty2014-12-121-8/+8
| * expire_reflog(): it's not an each_ref_fn anymoreMichael Haggerty2014-12-121-5/+5
| * refs.c: add a function to append a reflog entry to a fdRonnie Sahlberg2014-12-121-18/+30
| * refs.c: make ref_transaction_delete a wrapper for ref_transaction_updateRonnie Sahlberg2014-12-042-21/+3
| * refs.c: make ref_transaction_create a wrapper for ref_transaction_updateRonnie Sahlberg2014-12-041-25/+2
* | Git 2.3v2.3.0Junio C Hamano2015-02-053-1/+12
* | Merge git://github.com/git-l10n/git-poJunio C Hamano2015-02-021-5/+5
|\ \
| * | l10n: ca.po: Fix trailing whitespaceAlex Henrie2015-01-301-5/+5
|/ /
* | Git 2.3.0-rc2v2.3.0-rc2Junio C Hamano2015-01-271-1/+1
* | Merge git://github.com/git-l10n/git-poJunio C Hamano2015-01-272-929/+941
|\ \
| * \ Merge branch 'master' of git://github.com/alexhenrie/git-poJiang Xin2015-01-271-925/+937
| |\ \