summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Check rebase options version on public entry pointsjamill/rebase_opt_ver_checkJameson Miller2015-02-121-1/+3
|
* Merge pull request #2866 from ethomson/checkout_perf2Carlos Martín Nieto2015-02-1220-129/+379
|\ | | | | Checkout performance
| * remove some unused warningsEdward Thomson2015-02-042-3/+6
| |
| * checkout: hold seen dir paths in a mapEdward Thomson2015-02-043-49/+76
| |
| * attr_session: keep a temp bufferEdward Thomson2015-02-043-3/+9
| |
| * checkout: cache system attributes file locationEdward Thomson2015-02-043-17/+65
| |
| * attrcache: don't re-read attrs during checkoutEdward Thomson2015-02-0310-59/+172
| | | | | | | | | | | | | | | | | | | | | | During checkout, assume that the .gitattributes files aren't modified during the checkout. Instead, create an "attribute session" during checkout. Assume that attribute data read in the same checkout "session" hasn't been modified since the checkout started. (But allow subsequent checkouts to invalidate the cache.) Further, cache nonexistent git_attr_file data even when .gitattributes files are not found to prevent re-scanning for nonexistent files.
| * tests: update for new test dataEdward Thomson2015-02-023-4/+5
| |
| * checkout test: ensure .gitattributes lifecycleEdward Thomson2015-02-025-0/+52
| | | | | | | | | | | | The .gitattributes cache should not reload .gitattributes in the middle of checking out, only between checkout operations. Otherwise, we'll spend all our time stat'ing and read'ing the gitattributes.
* | Merge pull request #2862 from ↵Carlos Martín Nieto2015-02-122-0/+113
|\ \ | | | | | | | | | | | | jeffhostetler/jeffhostetler/bug/branch_create_after_namespace Remove stale reflog namespace directory before branch creation
| * | Fix branch creation when branch name matches namespace of previously deleted ↵Jeff Hostetler2015-02-032-0/+113
| | | | | | | | | | | | branch
* | | Merge pull request #2880 from ethomson/mkdir_rootCarlos Martín Nieto2015-02-125-17/+65
|\ \ \ | | | | | | | | Ensure we can make a repo at the root of the filesystem
| * | | mkdir: respect the root pathEdward Thomson2015-02-051-11/+18
| | | | | | | | | | | | | | | | | | | | Don't try to strip trailing paths from the root directory on Windows (trying to create `C:` will fail).
| * | | stat: don't remove trailing '/' from root on win32Edward Thomson2015-02-052-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `p_stat` calls `git_win32_path_from_utf8`, which canonicalizes the path. Do not further try to modify the path, else we trim the trailing slash from a root directory and try to access `C:` instead of `C:/`.
| * | | appveyor: include the invasive filesystem testsEdward Thomson2015-02-051-0/+2
| | | |
| * | | repo: ensure we can create repo at filesystem rootEdward Thomson2015-02-051-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test to ensure that we can create a repository at the filesystem root. Introduces a new test environment variable, `GITTEST_INVASIVE_FILESYSTEM` for tests that do terrible things like escaping the clar sandbox and writing to the root directory. It is expected that the CI builds will enable this but that normal people would not want this.
* | | | Merge pull request #2845 from rakuco/libssh2-detection-fixCarlos Martín Nieto2015-02-121-1/+2
|\ \ \ \ | | | | | | | | | | Add libssh2's library and include directories.
| * | | | Add libssh2's library and include directories.Raphael Kubo da Costa2015-01-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow-up to 4f91bfa ("Find libssh2 via pkg-config"): FindPkgConfig sets <foo>_INCLUDE_DIRS, not <foo>_INCLUDE_DIR like FindLIBSSH2 did. Additionally, if using only FindPkgConfig to find libssh2, we have to call LINK_DIRECTORIES() as well to pass the appropriate -L entries, otherwise the build will only work if libssh2.so is in a directory searched automatically by the linker.
* | | | | Merge pull request #2889 from jeffhostetler/jeffhostetler/merge_performanceCarlos Martín Nieto2015-02-125-0/+226
|\ \ \ \ \ | | | | | | | | | | | | Large merge perf test.
| * | | | | Large merge perf test.Jeff Hostetler2015-02-065-0/+226
| | | | | |
* | | | | | Merge pull request #2894 from ethomson/copyrightsCarlos Martín Nieto2015-02-112-21/+40
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update some third-party copyrights
| * | | | | | clar: use actual license and copyrightEdward Thomson2015-02-101-21/+15
| | | | | | |
| * | | | | | Credit utf8proc for utf8 iteratorEdward Thomson2015-02-101-0/+25
| | | | | | |
* | | | | | | Merge pull request #2893 from phatblat/ben/pr/doc-commentsCarlos Martín Nieto2015-02-119-23/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix doc comment formatting
| * | | | | | | Use correct Doxygen trailing comment syntaxBen Chatelain2015-02-103-7/+7
| | | | | | | |
| * | | | | | | Fix doc comment formattingBen Chatelain2015-02-109-23/+22
| |/ / / / / /
* | | | | | | Fixed error when including git2/include/sys/stream.hJohn Haley2015-02-111-0/+2
|/ / / / / /
* | | | | | Merge pull request #2890 from arthurschreiber/patch-5nulltoken2015-02-061-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Speed up AppVeyor builds.
| * | | | | | Speed up AppVeyor builds.Arthur Schreiber2015-02-061-2/+0
|/ / / / / / | | | | | | | | | | | | AppVeyor build machines come with Python 2.7 and CMake 2.8 pre-installed and in the PATH.
* | | | | | Merge pull request #2884 from libgit2/cmn/template-pathEdward Thomson2015-02-051-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | repository: parse init.templatedir as a path
| * | | | | | repository: parse init.templatedir as a pathcmn/template-pathCarlos Martín Nieto2015-02-061-1/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | This is a path so we must use the path getter so we get the tilde expansion done.
* | | | | | Merge pull request #2881 from ethomson/clarEdward Thomson2015-02-051-0/+5
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Update clar to d17c7f6
| * | | | | Update clar to d17c7f6Edward Thomson2015-02-051-0/+5
|/ / / / /
* | | | | Merge pull request #2867 from ethomson/8dot3Edward Thomson2015-02-055-1/+34
|\ \ \ \ \ | | | | | | | | | | | | Handle 8dot3 filenames being disabled on Win32
| * | | | | win32: further cleanups for 8.3 disablingEdward Thomson2015-02-034-9/+30
| | | | | |
| * | | | | win32: cleanup 8.3 disabled testsEdward Thomson2015-02-033-40/+16
| | | | | |
| * | | | | Fix test failures when 8.3 is disabledLinquize2015-01-313-5/+41
| | |_|_|/ | |/| | |
* | | | | Merge pull request #2875 from JIghtuse/masterEdward Thomson2015-02-051-0/+3
|\ \ \ \ \ | | | | | | | | | | | | for-each-ref example: initialize libgit2 in main
| * | | | | for-each-ref example: init/shutdown libgit2 in mainBoris Egorov2015-02-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't get how it was working without git_libgit2_init() call. I run it and libgit2 throws assertion somewhere in its internals. Now it works. Updated commit with shutdown at the end.
* | | | | | Merge pull request #2872 from ethomson/pedanticEdward Thomson2015-02-043-99/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixes for pedantry
| * | | | | | hash_generic: __extension__ keyword for pedantryEdward Thomson2015-02-041-1/+1
| | | | | | |
| * | | | | | bswap: remove unused bswapEdward Thomson2015-02-032-98/+0
| | | | | | |
* | | | | | | Merge pull request #2874 from modocache/add-giftEdward Thomson2015-02-041-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | README.md: Add Swift bindings "Gift"
| * | | | | | | README.md: Add Swift bindings "Gift"Brian Gesiak2015-02-041-0/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #2873 from ethomson/structinitCarlos Martín Nieto2015-02-041-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | structinit test: use %PRIuZ instead of %d for size_t
| * | | | | | structinit test: use %PRIuZ instead of %d for size_tEdward Thomson2015-02-041-1/+1
|/ / / / / /
* | | | | | Merge pull request #2870 from urkud/log-libssh-not-foundEdward Thomson2015-02-031-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Tell user if libssh was not found
| * | | | | | Tell user if libssh was not foundYury G. Kudryashov2015-02-041-0/+2
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Fixes #2665
* | | | | | Merge pull request #2861 from libgit2/ntk/appveyorEdward Thomson2015-02-031-6/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | AppVeyor: Prettify build script
| * | | | | AppVeyor: Prettify build scriptntk/appveyornulltoken2015-01-311-6/+1
| |/ / / /
View Lorry Controller Status