summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | | fetch: declare variables at the top of the blockCarlos Martín Nieto2012-10-181-1/+2
| | |
* | | remote: support fetch cancelationCarlos Martín Nieto2012-10-183-5/+35
| |/ |/| | | | | | | | | Introduce git_remote_stop() which sets a variable that is checked by the fetch process in a few key places. If this is variable is set, the fetch is aborted.
* | Merge pull request #968 from arrbee/diff-support-typechangeRussell Belfer2012-10-1713-161/+365
|\ \ | | | | | | Support TYPECHANGE records in status and adjust checkout accordingly
| * | Fix minor bugsRussell Belfer2012-10-172-7/+5
| | | | | | | | | | | | | | | | | | Fixed no-submodule speedup of new checkout code. Fixed missing final update to progress (which may go away, I realize). Fixed unused structure in header and incorrect comment.
| * | Skip submodule checkout pass if no submodulesRussell Belfer2012-10-171-2/+7
| | | | | | | | | | | | | | | Skip the third pass of checkout (where submodules are checked out) if the earlier passes found no submodules to be checked out.
| * | Add complex checkout test and then fix checkoutRussell Belfer2012-10-0912-138/+324
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This started as a complex new test for checkout going through the "typechanges" test repository, but that revealed numerous issues with checkout, including: * complete failure with submodules * failure to create blobs with exec bits * problems when replacing a tree with a blob because the tree "example/" sorts after the blob "example" so the delete was being processed after the single file blob was created This fixes most of those problems and includes a number of other minor changes that made it easier to do that, including improving the TYPECHANGE support in diff/status, etc.
| * | Cleanup TYPECHANGE supportRussell Belfer2012-10-091-37/+40
| | | | | | | | | | | | | | | | | | This is just some cleanup code, rearranging some of the checkout code where TYPECHANGE support was added and adding some comments to the diff header regarding the constants.
| * | Fix checkout to know about TYPECHANGE diffsRussell Belfer2012-10-091-1/+3
| | |
| * | Introduce status/diff TYPECHANGE flagsRussell Belfer2012-10-092-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | When I wrote the diff code, I based it on core git's diff output which tends to split a type change into an add and a delete. But core git's status has the notion of a T (typechange) flag for a file. This introduces that into our status APIs and modifies the diff code so it can be forced to not split type changes.
| * | Improve error propogation in checkoutRussell Belfer2012-10-091-24/+22
| | |
* | | Merge pull request #972 from PaulThompson/separate_strarrayBen Straub2012-10-171-0/+1
|\ \ \ | | | | | | | | Separated git_strarray from common.h. Added doxy comments.
| * | | Separated git_strarray from common.h. Added doxy comments.Paul Thompson2012-10-111-0/+1
| | | |
* | | | Incremental improvements to pack-objects logicPhilip Kelley2012-10-173-92/+95
| | | | | | | | | | | | | | | | Incorporate feedback for incr. improvements to pack-objects
* | | | Merge pull request #987 from pwkelley/pthread_condVicent Martí2012-10-162-0/+72
|\ \ \ \ | | | | | | | | | | Support pthread_cond_* on Win32
| * | | | Support pthread_cond_* on Win32Philip Kelley2012-10-162-0/+72
| | | | |
* | | | | test: Don't be so picky with failed lookupsVicent Marti2012-10-161-3/+3
|/ / / / | | | | | | | | | | | | Not found means not found, and the other way around.
* | | | config: also free the XDG bufferCarlos Martín Nieto2012-10-161-0/+1
| | | |
* | | | Merge pull request #952 from csware/config-locationsVicent Martí2012-10-166-79/+253
|\ \ \ \ | | | | | | | | | | Config location fixes
| * | | | Move win32 specific stuff to win32/findfile.cSven Strickroth2012-10-023-145/+175
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | | | Rename xdr to xdgSven Strickroth2012-10-023-14/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | | | Optimized win32_nextpathSven Strickroth2012-10-021-42/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on a suggestion by Russell Belfer. Signed-off-by: Sven Strickroth <email@cs-ware.de> Signed-off-by: Russell Belfer <rb@github.com>
| * | | | Silence MinGW warningsSven Strickroth2012-09-292-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | | | Added win32_ prefix for Win32-only methodsSven Strickroth2012-09-291-6/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | | | Make it compile with MinGW on WindowsSven Strickroth2012-09-291-19/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | | | Move code to find msysgit path using registry to own methodSven Strickroth2012-09-291-8/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | | | Find git installations based on %PATH%Sven Strickroth2012-09-291-0/+100
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | | | Implemented the full msysgit fallback chainSven Strickroth2012-09-251-5/+14
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | | | git_config_open_default: Honour xdr configSven Strickroth2012-09-251-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | | | Fixed missing methodSven Strickroth2012-09-251-0/+22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | | | Fixed typo: xdr config needs to have a lower priority than the global oneSven Strickroth2012-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | | | Correctly read xdr compatible %HOME%/.config/git/config config fileSven Strickroth2012-09-242-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This file is not just read if the global config file (%HOME%/.gitconfig) is not found, however, it is used everytime but with lower priority. Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | | | Automatically detect msysgit installation pathSven Strickroth2012-09-241-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not hardcode the installation path of msysgit, but read installation path from registry. Also "%PROGRAMFILES%\Git\etc" won't work on x64 systems with 64-bit libgit2, because msysgit is x86 only and located in "%ProgramFiles(x86)%\Git\etc". Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | | | Calculate the Windows user profile directory the same way as msysgitSven Strickroth2012-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On most systems %USERPROFILE% is the same as %HOMEDRIVE%\%HOMEPATH%, however, for windows machines in an AD or domain environment this might be different and %HOMEDRIVE%\%HOMEPATH% seems to be better. Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | | | Honor %HOME% on windowsSven Strickroth2012-09-241-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use %HOME% before trying to figure out the windows user directory. Users might set this as they are used on *nix systems. Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | | | Merge pull request #984 from arrbee/fix-fnmatch-and-ignorePhilip Kelley2012-10-168-26/+110
|\ \ \ \ \ | | | | | | | | | | | | Fix single file ignores
| * | | | | Fix single-file ignore checksRussell Belfer2012-10-153-11/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To answer if a single given file should be ignored, the path to that file has to be processed progressively checking that there are no intermediate ignored directories in getting to the file in question. This enables that, fixing the broken old behavior, and adds tests to exercise various ignore situations.
| * | | | | Import DOS fix for fnmatchRussell Belfer2012-10-152-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because fnmatch uses recursion, there were some input sequences that cause seriously degenerate behavior. This imports a fix that imposes a max recursion limiter to avoid the worst of it.
| * | | | | Always use internal fnmatch, not systemRussell Belfer2012-10-155-8/+1
| | | | | |
* | | | | | Merge pull request #982 from nulltoken/clone/no-checkoutBen Straub2012-10-151-3/+19
|\ \ \ \ \ \ | |/ / / / / |/| | | | | clone: Explicit support of no-checkout option
| * | | | | clone: fix detection of remote HEADnulltoken2012-10-151-1/+4
| | | | | |
| * | | | | clone: Explicit support of no-checkout optionnulltoken2012-10-151-2/+15
| | | | | |
* | | | | | test: fix some memory leaksnulltoken2012-10-152-9/+19
| | | | | |
* | | | | | reset: prevent hard reset in a bare repositorynulltoken2012-10-151-3/+5
|/ / / / /
* | | | | Fix leak in the testsCarlos Martín Nieto2012-10-151-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Also introduce the slective ref trimming promised but also missed in the previous commit.
* | | | | refs: loosen the OID parsingCarlos Martín Nieto2012-10-151-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to require loose references to contain only an OID (possibly after trimming the string). This is however not enough for letting us lookup FETCH_HEAD, which can have a lot of content after the initial OID. Change the parsing rules so that a loose refernce must e at least 40 bytes long and the 41st (if it's there) must be accepted by isspace(3). This makes the trim unnecessary, so only do it for symrefs. This fixes #977.
* | | | | Fix buffer overrun in git_buf_put_base64Philip Kelley2012-10-141-1/+1
| | | | |
* | | | | branches: propagate EEXISTS upon creationnulltoken2012-10-111-5/+4
| | | | |
* | | | | refs: propagate EEXISTS upon renamingnulltoken2012-10-111-2/+2
| |/ / / |/| | |
* | | | Merge pull request #971 from arrbee/base64-encoderVicent Martí2012-10-102-0/+43
|\ \ \ \ | | | | | | | | | | Add git_buf_put_base64 to buffer API
| * | | | Add git_buf_put_base64 to buffer APIRussell Belfer2012-10-102-0/+43
| | | | |
View Lorry Controller Status