summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* docs: add unsaved index safety to changelogethomson/index_dirtyEdward Thomson2018-06-291-0/+12
* settings: optional unsaved index safetyEdward Thomson2018-06-295-3/+35
* index: return a unique error code on dirty indexEdward Thomson2018-06-293-1/+24
* checkout: FORCE doesn't halt on dirty indexEdward Thomson2018-06-293-26/+19
* index: commit the changes to the index properlyEdward Thomson2018-06-299-15/+59
* index: test dirty index bitEdward Thomson2018-06-291-0/+53
* index: add a dirty bit reflecting unsaved changesEdward Thomson2018-06-292-6/+40
* stash: use _an_ index not _the_ indexEdward Thomson2018-06-291-28/+77
* checkout tests: validate GIT_CHECKOUT_NO_REFRESHEdward Thomson2018-06-291-0/+64
* checkout: always set the index in checkout dataEdward Thomson2018-06-261-6/+6
* index::addall tests: write the indexEdward Thomson2018-06-261-0/+17
* index::reuc tests: test that checkout succeedsEdward Thomson2018-06-261-8/+8
* index::names tests: add conflicts with high stagesEdward Thomson2018-06-261-0/+37
* Merge pull request #4695 from nelhage/git_pkt-type-confusionPatrick Steinhardt2018-06-251-1/+6
|\
| * Fix type confusion in git_smart__connectNelson Elhage2018-06-241-1/+6
* | Merge pull request #4696 from nelhage/git_pkt_ref-check-lenPatrick Steinhardt2018-06-251-0/+5
|\ \
| * | Verify ref_pkt's are long enoughNelson Elhage2018-06-241-0/+5
| |/
* | Merge pull request #4411 from pks-t/pks/config-parse-cleanupsEdward Thomson2018-06-223-41/+41
|\ \ | |/ |/|
| * config_file: avoid free'ing OOM buffersPatrick Steinhardt2018-06-221-6/+2
| * config_parse: always sanitize out-parameters in `parse_variable`Patrick Steinhardt2018-06-221-20/+23
| * config_parse: have `git_config_parse` own entry value and namePatrick Steinhardt2018-06-223-16/+17
|/
* Merge pull request #4685 from csware/no-git_buf_freeEdward Thomson2018-06-184-4/+4
|\
| * Fix last references to deprecated git_buf_freeSven Strickroth2018-06-184-4/+4
* | Merge pull request #4606 from libgit2/cmn/revwalk-iterationEdward Thomson2018-06-182-10/+44
|\ \ | |/ |/|
| * revwalk: formatting updatescmn/revwalk-iterationEdward Thomson2018-06-181-17/+17
| * revwalk: remove one useless layer of functionsCarlos Martín Nieto2018-04-111-32/+17
| * revwalk: avoid walking the entire history when output is unsortedCarlos Martín Nieto2018-04-012-10/+59
* | Merge pull request #4586 from emilio/mailmapEdward Thomson2018-06-1863-21/+1236
|\ \
| * | Require the length argument to git_mailmap_from_buffer and make mailmap_add_b...Nika Layzell2018-06-174-27/+9
| * | mailmap: git_buf_free => git_buf_disposeNika Layzell2018-06-142-10/+10
| * | mailmap: Hide EEXISTS to simplify git_mailmap_add_entry callersNika Layzell2018-06-142-3/+5
| * | mailmap: Free the mailmap vectorNika Layzell2018-06-141-0/+2
| * | mailmap: API and style cleanupNika Layzell2018-06-1410-105/+112
| * | mailmap: Updates tests for new API and featuresNika Layzell2018-06-1410-33/+153
| * | mailmap: Rewrite API to support accurate mailmap resolutionNika Layzell2018-06-145-208/+344
| * | mailmap: API and style cleanupNika Layzell2018-06-146-70/+122
| * | mailmap: Switch mailmap parsing to use the git_parse moduleNika Layzell2018-06-148-315/+206
| * | mailmap: Clean up the mailmap fixture's .gitted directoryNika Layzell2018-06-1413-543/+0
| * | mailmap: Fix some other minor style nitsEmilio Cobos Álvarez2018-06-142-9/+8
| * | mailmap: Fix more bugs which snuck in when I rebasedNika Layzell2018-06-146-10/+10
| * | mailmap: Add a bunch of tests for the new mailmap functionalityNika Layzell2018-06-1458-0/+841
| * | mailmap: Integrate mailmaps with blame and signaturesNika Layzell2018-06-148-4/+117
| * | mailmap: Make everything a bit more style conformingNika Layzell2018-06-142-55/+113
| * | mailmap: Support path fixtures in cl_git_repository_init()Nika Layzell2018-06-143-17/+23
| * | mailmap: Add some super-basic testsEmilio Cobos Álvarez2018-06-141-0/+98
| * | mailmap: Don't error out when there's junk at the end of the lineEmilio Cobos Álvarez2018-06-141-3/+0
| * | mailmap: Don't return a freed pointer, even if we return an error codeEmilio Cobos Álvarez2018-06-141-1/+3
| * | mailmap: Do not error out when the mailmap contains an invalid lineEmilio Cobos Álvarez2018-06-141-4/+4
| * | mailmap: Be consistent about checking len vs. len > 0Emilio Cobos Álvarez2018-06-141-1/+1
| * | mailmap: git_vector_get already checks boundsEmilio Cobos Álvarez2018-06-141-4/+1