summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Handle explicitly ignored dir slightly differentlyrb/stash-skip-submodulesRussell Belfer2014-04-241-8/+9
* Treat ignored, empty, and untracked dirs differentRussell Belfer2014-04-234-22/+39
* Make checkout match diff for untracked/ignored dirRussell Belfer2014-04-226-99/+146
* Failing test for stashing a buried ignored fileRussell Belfer2014-04-221-0/+13
* Make stash and checkout ignore contained reposRussell Belfer2014-04-224-12/+38
* Merge pull request #2282 from libgit2/cmn/remote-easier-bindVicent Marti2014-04-224-32/+76
|\
| * transports: allow the creds callback to say it doesn't existCarlos Martín Nieto2014-04-223-32/+58
| * remote: provide read access to the callback structureCarlos Martín Nieto2014-04-222-0/+18
|/
* Merge pull request #2287 from libgit2/rb/moar-coverity-fixesVicent Marti2014-04-224-18/+16
|\
| * Fix some coverity-found issuesRussell Belfer2014-04-214-18/+16
* | Merge pull request #2286 from libgit2/rb/fix-reset-staged-deleteVicent Marti2014-04-222-5/+45
|\ \ | |/ |/|
| * Fix reset for staged deletesRussell Belfer2014-04-212-5/+45
|/
* Merge pull request #2275 from jacquesg/apple-warningRussell Belfer2014-04-212-11/+34
|\
| * Introduce AddCFlagIfSupported CMake macroJacques Germishuys2014-04-192-38/+25
| * Only disable deprecation warnings on Apple for OpenSSLJacques Germishuys2014-04-181-3/+5
| * Use CHECK_C_COMPILER_FLAG to determine if the compiler supports a flagJacques Germishuys2014-04-181-8/+42
| * Fix inconsistent use of lower-case and upper-case names for macrosJacques Germishuys2014-04-181-3/+3
* | attrcache: fix use-after-freeCarlos Martín Nieto2014-04-211-1/+1
* | sysdir: free the path if we cannot find the fileCarlos Martín Nieto2014-04-211-1/+1
* | Merge pull request #2273 from jacquesg/ssh-interactiveVicent Marti2014-04-193-15/+117
|\ \
| * | Only zero sensitive information on destruction (and memory actually allocated...Jacques Germishuys2014-04-181-7/+21
| * | Replace void * with proper callback typesJacques Germishuys2014-04-181-2/+2
| * | Make git_cred_ssh_custom_new() naming more consistentJacques Germishuys2014-04-183-8/+8
| * | Introduce git_cred_ssh_interactive_new()Jacques Germishuys2014-04-183-0/+88
| |/
* | Merge pull request #2279 from libgit2/rb/moar-eegnöre-fîxésVicent Marti2014-04-1911-229/+325
|\ \
| * | Minor fixesRussell Belfer2014-04-184-5/+8
| * | Fix ignore difference from git with trailing /*Russell Belfer2014-04-183-0/+28
| * | Preload attribute files that may contain macrosRussell Belfer2014-04-183-45/+136
| * | Cleanup tests with helper functionsRussell Belfer2014-04-182-154/+83
| * | Pop ignore only if whole relative path matchesRussell Belfer2014-04-185-35/+80
| |/
* | Merge pull request #2213 from ethomson/safecrlfRussell Belfer2014-04-184-1/+99
|\ \ | |/ |/|
| * Determine crlf safety by statistics, not literal reversibilityEdward Thomson2014-04-071-24/+9
| * Introduce core.safecrlf handlingEdward Thomson2014-04-074-3/+116
* | Merge pull request #2274 from libgit2/cmn/ssh-expect-usernameVicent Marti2014-04-182-50/+14
|\ \
| * | cred: tighten username rulesCarlos Martín Nieto2014-04-182-50/+14
|/ /
* | Merge pull request #2108 from libgit2/rb/threadsafe-index-iteratorVicent Marti2014-04-1850-1292/+2303
|\ \
| * | Some memory leak fixesRussell Belfer2014-04-174-30/+38
| * | Fix broken logic for attr cache invalidationRussell Belfer2014-04-1713-210/+265
| * | Lock attribute file while reparsing dataRussell Belfer2014-04-173-17/+49
| * | Fix race checking for existing index itemsRussell Belfer2014-04-172-22/+40
| * | Fix tests with new attr cache codeRussell Belfer2014-04-174-57/+109
| * | Attribute file cache refactorRussell Belfer2014-04-1718-756/+940
| * | Minor tree cache speedupsRussell Belfer2014-04-172-17/+11
| * | Fix leak in git_index_conflict_cleanupRussell Belfer2014-04-172-29/+22
| * | Fix leak when using push and pop with ignoresRussell Belfer2014-04-171-0/+3
| * | Fix refcount issues with mutex protected ignoresRussell Belfer2014-04-171-1/+15
| * | Fix threading tests when threads disabledRussell Belfer2014-04-172-11/+12
| * | Clean up index snapshot function namingRussell Belfer2014-04-175-54/+63
| * | Index locking and entry allocation changesRussell Belfer2014-04-176-202/+309
| * | Add diff threading tests and attr file cache locksRussell Belfer2014-04-1713-140/+361