summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ym/fix-opportunistic-index-update-race'Junio C Hamano2014-06-036-5/+90
|\
| * read-cache.c: verify index file before we opportunistically update itym/fix-opportunistic-index-update-raceYiannis Marangos2014-04-103-1/+69
| * wrapper.c: add xpread() similar to xread()Yiannis Marangos2014-04-104-4/+21
* | Merge branch 'mh/ref-transaction'Junio C Hamano2014-06-0313-285/+585
|\ \
| * | ref_transaction_commit(): work with transaction->updates in placemh/ref-transactionMichael Haggerty2014-04-071-4/+1
| * | struct ref_update: add a type fieldMichael Haggerty2014-04-071-5/+3
| * | struct ref_update: add a lock fieldMichael Haggerty2014-04-071-17/+19
| * | ref_transaction_commit(): simplify code using temporary variablesMichael Haggerty2014-04-071-8/+13
| * | struct ref_update: store refname as a FLEX_ARRAYMichael Haggerty2014-04-071-9/+6
| * | struct ref_update: rename field "ref_name" to "refname"Michael Haggerty2014-04-072-10/+10
| * | refs: remove API function update_refs()Michael Haggerty2014-04-072-33/+20
| * | update-ref --stdin: reimplement using reference transactionsMichael Haggerty2014-04-071-67/+75
| * | refs: add a concept of a reference transactionMichael Haggerty2014-04-072-0/+164
| * | update-ref --stdin: harmonize error messagesMichael Haggerty2014-04-072-28/+28
| * | update-ref --stdin: improve the error message for unexpected EOFMichael Haggerty2014-04-072-8/+8
| * | t1400: test one mistake at a timeMichael Haggerty2014-04-071-1/+7
| * | update-ref --stdin -z: deprecate interpreting the empty string as zerosMichael Haggerty2014-04-073-8/+17
| * | update-ref.c: extract a new function, parse_next_sha1()Michael Haggerty2014-04-072-63/+99
| * | t1400: test that stdin -z update treats empty <newvalue> as zerosMichael Haggerty2014-04-071-0/+7
| * | update-ref --stdin: simplify error messages for missing oldvaluesMichael Haggerty2014-04-072-6/+6
| * | update-ref --stdin: make error messages more consistentMichael Haggerty2014-04-072-11/+11
| * | update-ref --stdin: improve error messages for invalid valuesMichael Haggerty2014-04-072-15/+17
| * | update-ref.c: extract a new function, parse_refname()Michael Haggerty2014-04-071-49/+41
| * | parse_cmd_verify(): copy old_sha1 instead of evaluating <oldvalue> twiceMichael Haggerty2014-04-071-1/+1
| * | update-ref --stdin: read the whole input at onceMichael Haggerty2014-04-071-62/+108
| * | update_refs(): fix constnessMichael Haggerty2014-04-073-3/+3
| * | refs.h: rename the action_on_err constantsMichael Haggerty2014-04-0711-29/+40
| * | t1400: add some more tests involving quoted argumentsMichael Haggerty2014-04-071-1/+25
| * | parse_arg(): really test that argument is properly terminatedMichael Haggerty2014-04-072-7/+17
| * | t1400: provide more usual input to the commandMichael Haggerty2014-04-071-1/+1
| * | t1400: fix name and expected result of one testMichael Haggerty2014-04-071-2/+2
* | | Merge branch 'ks/tree-diff-nway'Junio C Hamano2014-06-0310-170/+723
|\ \ \
| * | | mingw: activate allocaks/tree-diff-nwayKirill Smelkov2014-04-092-0/+1
| * | | combine-diff: speed it up, by using multiparent diff tree-walker directlyKirill Smelkov2014-04-072-5/+84
| * | | tree-diff: rework diff_tree() to generate diffs for multiparent cases as wellKirill Smelkov2014-04-074-64/+465
| * | | Portable alloca for GitKirill Smelkov2014-03-274-2/+30
| * | | tree-diff: reuse base str(buf) memory on sub-tree recursionKirill Smelkov2014-03-271-19/+19
| * | | tree-diff: no need to call "full" diff_tree_sha1 from show_path()Kirill Smelkov2014-03-271-2/+6
| * | | tree-diff: rework diff_tree interface to be sha1 basedKirill Smelkov2014-03-271-32/+28
| * | | tree-diff: diff_tree() should now be staticKirill Smelkov2014-03-262-4/+2
| * | | tree-diff: remove special-case diff-emitting code for empty-tree casesKirill Smelkov2014-03-261-12/+14
| * | | tree-diff: simplify tree_entry_pathcmpKirill Smelkov2014-03-201-11/+6
| * | | tree-diff: show_path prototype is not needed anymoreKirill Smelkov2014-03-201-3/+0
| * | | tree-diff: rename compare_tree_entry -> tree_entry_pathcmpKirill Smelkov2014-03-201-6/+9
| * | | tree-diff: move all action-taking code out of compare_tree_entry()Kirill Smelkov2014-03-201-16/+12
| * | | tree-diff: don't assume compare_tree_entry() returns -1,0,1Kirill Smelkov2014-03-201-8/+14
| * | | tree-diff: consolidate code for emitting diffs and recursion in one placeKirill Smelkov2014-03-201-30/+82
| * | | tree-diff: show_tree() is not neededKirill Smelkov2014-03-041-32/+3
| * | | tree-diff: no need to pass match to skip_uninteresting()Kirill Smelkov2014-02-241-9/+8
| * | | tree-diff: no need to manually verify that there is no mode change for a pathKirill Smelkov2014-02-241-10/+5
View Lorry Controller Status