summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* submodule: remove the RESET enum valuescmn/submodule-config-stateCarlos Martín Nieto2015-06-222-9/+1
* submodule: test unsetting config optionsCarlos Martín Nieto2015-06-221-13/+29
* submodule: handle writing out all enum values for settingsCarlos Martín Nieto2015-06-222-65/+21
* config: provide a function to reverse-lookup mapped cvarsCarlos Martín Nieto2015-06-222-0/+26
* examples: adjust to submodule status API changeCarlos Martín Nieto2015-06-221-16/+10
* submodule: test more accurately for non-existenceCarlos Martín Nieto2015-06-221-4/+4
* submodule: fix potential leak in the testsCarlos Martín Nieto2015-06-221-2/+1
* submodule: get rid of `_save()`Carlos Martín Nieto2015-06-223-61/+0
* submodule: make `_set_url()` affect the configurationCarlos Martín Nieto2015-06-224-61/+17
* submodule: make `_set_branch()` affect the configurationCarlos Martín Nieto2015-06-223-70/+53
* submodule: make `_set_update_fetch_recurse_submodules()` affect the configCarlos Martín Nieto2015-06-223-53/+49
* submodule: make `_set_update()` affect the configurationCarlos Martín Nieto2015-06-223-58/+47
* submodule: correct detection of existing submodulesCarlos Martín Nieto2015-06-221-10/+26
* submodule: bring back finding by pathCarlos Martín Nieto2015-06-221-0/+42
* submodule: add an ignore option to statusCarlos Martín Nieto2015-06-2210-61/+50
* submodule: don't let status change an existing instanceCarlos Martín Nieto2015-06-226-24/+44
* submodule: make set_ignore() affect the configurationCarlos Martín Nieto2015-06-225-56/+50
* submodule: remove the per-repo cacheCarlos Martín Nieto2015-06-227-576/+270
* Merge pull request #3239 from git-up/stash_indexCarlos Martín Nieto2015-06-221-0/+2
|\
| * Write modified index in git_stash_apply()Pierre-Olivier Latour2015-06-211-0/+2
|/
* Merge pull request #3233 from ethomson/status_typechangeCarlos Martín Nieto2015-06-204-12/+64
|\
| * diff: preserve original mode in the indexEdward Thomson2015-06-203-12/+16
| * status: test that symlinks don't lose their modeEdward Thomson2015-06-201-0/+48
|/
* Merge pull request #3238 from git-up/double_freeEdward Thomson2015-06-201-2/+0
|\
| * Fixed index being double-freed in stash testsPierre-Olivier Latour2015-06-201-2/+0
* | Merge pull request #3236 from libgit2/cmn/index-checksumEdward Thomson2015-06-206-16/+63
|\ \ | |/ |/|
| * index: make relative comparison use the checksum as wellcmn/index-checksumCarlos Martín Nieto2015-06-204-9/+6
| * index: use the checksum to check whether it's been modifiedCarlos Martín Nieto2015-06-193-5/+55
| * index: user a better assertion when comparing sizesCarlos Martín Nieto2015-06-191-2/+2
* | Merge pull request #3232 from Therzok/patch-2Carlos Martín Nieto2015-06-201-1/+1
|\ \
| * | Quote LIBSSH2_LIBRARIES callMarius Ungureanu2015-06-191-1/+1
* | | tests: tick over five seconds instead of oneCarlos Martín Nieto2015-06-201-1/+1
|/ /
* | Merge pull request #3229 from git-up/build_warningsCarlos Martín Nieto2015-06-173-2/+2
|\ \
| * | Fixed Xcode 6.1 build warningsPierre-Olivier Latour2015-06-173-2/+2
|/ /
* | Merge pull request #3227 from jeffhostetler/memory_leak__tests_network_refspecsCarlos Martín Nieto2015-06-171-0/+2
|\ \ | |/ |/|
| * Fix memory leak in tests/network/refspecs.cJeff Hostetler2015-06-171-0/+2
|/
* Merge pull request #3219 from libgit2/cmn/racy-diffCarlos Martín Nieto2015-06-1714-7/+229
|\
| * checkout: allow workdir to contain checkout targetethomson/racy-diffcmn/racy-diffEdward Thomson2015-06-161-3/+14
| * merge::workdir::dirty: tick idx to defeat racy-gitEdward Thomson2015-06-161-0/+12
| * Introduce p_utimes and p_futimesEdward Thomson2015-06-166-6/+110
| * tests: tick the index when we count OID calculationsCarlos Martín Nieto2015-06-165-19/+34
| * crlf: tick the index forward to work around racy-git behaviourCarlos Martín Nieto2015-06-162-4/+27
| * index: zero the size of racily-clean entriesCarlos Martín Nieto2015-06-161-0/+18
| * diff: add failing test for racy-git in the indexCarlos Martín Nieto2015-06-161-0/+39
* | Merge pull request #3209 from libgit2/cmn/double-authorEdward Thomson2015-06-162-0/+17
|\ \
| * | commit: ignore multiple author fieldscmn/double-authorCarlos Martín Nieto2015-06-112-0/+17
* | | Merge pull request #3225 from libgit2/cmn/url-emptyEdward Thomson2015-06-161-2/+6
|\ \ \
| * | | remote: return EINVALIDSPEC when given an empty URLcmn/url-emptyCarlos Martín Nieto2015-06-161-2/+6
|/ / /
* | | Merge pull request #3221 from git-up/build_warningsCarlos Martín Nieto2015-06-167-17/+24
|\ \ \ | |_|/ |/| |
| * | Fixed Xcode 6.1 build warningsPierre-Olivier Latour2015-06-157-17/+24