aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add Plan 9 supportFazlul Shahriar2019-12-253-0/+80
| | | | | | | | | Not all the tests pass yet but this makes go-git usable on Plan 9. Please merge this after https://github.com/src-d/go-billy/pull/78. Fixes #756 Signed-off-by: Fazlul Shahriar <fshahriar@gmail.com>
* Merge pull request #1231 from alexandear/fix-typosMáximo Cuadros2019-11-0138-70/+70
|\ | | | | *: fix typos in comments, variables and function names
| * Fix typos in comments, variables and function namesOleksandr Redko2019-10-2438-70/+70
| | | | | | | | Signed-off-by: Oleksandr Redko <oleksandr.red+github@gmail.com>
* | Merge pull request #1235 from jmahler/masterMáximo Cuadros2019-11-011-1/+1
|\ \ | |/ |/| fix broken link (s/ftp/https/)
| * fix broken link (s/ftp/https/)Jeremiah Mahler2019-10-311-1/+1
|/ | | | Signed-off-by: Jeremiah Mahler <jmmahler@gmail.com>
* Merge pull request #1226 from asynts/patch-1Máximo Cuadros2019-10-151-1/+1
|\ | | | | typo
| * typoPaul Scharnofske2019-10-141-1/+1
| | | | | | | | Signed-off-by: Paul Scharnofske <asynts@gmail.com>
* | Merge pull request #1225 from sjansen/issues/936Máximo Cuadros2019-10-153-30/+114
|\ \ | |/ |/| format: diff, Handle no newline at end of file. Fixes #936
| * format: diff, Handle no newline at end of file. Fixes #936Stuart Jansen2019-10-133-30/+114
|/ | | | Signed-off-by: Stuart Jansen <sjansen@buscaluz.org>
* Merge pull request #1214 from 117/masterMáximo Cuadros2019-08-312-1/+61
|\ | | | | Add numeric username support for SSH urls.
| * Use gocheck for test.Chief2019-08-301-17/+27
| | | | | | | | Signed-off-by: Chief <admin@117.sh>
| * Add tests for SSH url matching.Chief2019-08-301-0/+50
| | | | | | | | Signed-off-by: Chief <admin@117.sh>
| * Add numeric username support for SSH urls.Chief2019-08-281-1/+1
|/ | | | Signed-off-by: Chief <admin@117.sh>
* Merge pull request #1195 from digininja/masterMáximo Cuadros2019-08-161-1/+1
|\ | | | | Spelling mistake
| * Spelling mistakeRobin Wood2019-07-271-1/+1
| | | | | | | | Signed-off-by: Robin Wood <robin@digi.ninja>
* | Merge pull request #1180 from orisano/feat-improve-patch-deltaMáximo Cuadros2019-08-112-63/+89
|\ \ | | | | | | feat: improve patch delta performance
| * | feat: avoid memory allocation on ApplyDelta, PatchDeltaNao YONASHIRO2019-07-311-15/+30
| | | | | | | | | | | | Signed-off-by: Nao YONASHIRO <owan.orisano@gmail.com>
| * | refactor: use bufPoolNao YONASHIRO2019-07-311-12/+3
| | | | | | | | | | | | Signed-off-by: Nao YONASHIRO <owan.orisano@gmail.com>
| * | feat: avoid memory allocation on resolveDeltasNao YONASHIRO2019-07-311-46/+53
| | | | | | | | | | | | Signed-off-by: Nao YONASHIRO <owan.orisano@gmail.com>
| * | feat: avoid ioutil.ReadAll on ApplyDeltaNao YONASHIRO2019-07-311-2/+15
| | | | | | | | | | | | Signed-off-by: Nao YONASHIRO <owan.orisano@gmail.com>
* | | Merge pull request #1208 from sirodoht/fix-example-pullMáximo Cuadros2019-08-111-1/+1
|\ \ \ | | | | | | | | Fix typo on pull example
| * | | examples: Fix typo on pull exampleTheodore Keloglou2019-08-071-1/+1
|/ / / | | | | | | | | | Signed-off-by: Theodore Keloglou <theodorekeloglou@gmail.com>
* | | Merge pull request #1206 from knqyf263/feature/add_log_limitingMáximo Cuadros2019-08-055-2/+218
|\ \ \ | | | | | | | | Add limiting options to git log
| * | | Add limiting options to git logknqyf2632019-08-045-2/+218
|/ / / | | | | | | | | | Signed-off-by: knqyf263 <knqyf263@gmail.com>
* | | Merge pull request #1205 from knqyf263/fix/test_coverageMáximo Cuadros2019-08-041-11/+1
|\ \ \ | | | | | | | | Add -coverpkg to fix test coverage
| * | | Add -coverpkg to fix test coverageknqyf2632019-08-041-11/+1
| | | | | | | | | | | | | | | | Signed-off-by: knqyf263 <knqyf263@gmail.com>
* | | | Merge pull request #1204 from knqyf263/fix/handle_eof_errMáximo Cuadros2019-08-042-3/+33
|\ \ \ \ | |/ / / |/| | | Handle EOF error in commitFileIter.ForEach
| * | | Remove elseknqyf2632019-08-041-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: knqyf263 <knqyf263@gmail.com>
| * | | Add TestLogFileWithError for coverageknqyf2632019-08-031-1/+23
| | | | | | | | | | | | | | | | Signed-off-by: knqyf263 <knqyf263@gmail.com>
| * | | Handle io.EOF error in commitFileIter.ForEachknqyf2632019-08-032-2/+5
| | | | | | | | | | | | | | | | Signed-off-by: knqyf263 <knqyf263@gmail.com>
| * | | Add assertion for unhandled error in TestLogFileknqyf2632019-08-031-4/+8
|/ / / | | | | | | | | | Signed-off-by: knqyf263 <knqyf263@gmail.com>
* | | Merge pull request #1203 from sapk-fork/fix-int64v4.13.1Máximo Cuadros2019-08-011-1/+1
|\ \ \ | |/ / |/| | worktree: force convert to int64 to support 32bit os. Fix #1202
| * | worktree: force convert to int64 to support 32bit os. Fix #1202Antoine GIRARD2019-08-011-1/+1
|/ / | | | | | | Signed-off-by: Antoine GIRARD <sapk@sapk.fr>
* | Merge pull request #1200 from src-d/go-modv4.13.0Máximo Cuadros2019-07-292-10/+30
|\ \ | | | | | | *: go module update
| * | *: go module updateMáximo Cuadros2019-07-292-10/+30
|/ / | | | | | | Signed-off-by: Máximo Cuadros <mcuadros@gmail.com>
* | Merge pull request #1199 from src-d/clean-upMáximo Cuadros2019-07-2928-49/+40
|\ \ | | | | | | *: code quality improvements
| * | plumbing/object: don't assign err from ForEach loopChristian Muehlhaeuser2019-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | Since we don't check the value anyway, as it can't possibly be anything but nil. Signed-off-by: Christian Muehlhaeuser <muesli@gmail.com> (cherry picked from commit 293e70fbceb5c81f33a96d5705f10785c6063db9)
| * | *: avoid unnecessary conversionsChristian Muehlhaeuser2019-07-2914-18/+18
| | | | | | | | | | | | | | | | | | | | | No need to convert these values, they're already of the right type. Signed-off-by: Christian Muehlhaeuser <muesli@gmail.com> (cherry picked from commit a1d8a7ac8bd0e4aff0f27dbb8bb37b8bd13a1346)
| * | plumbing/format: simplify codeChristian Muehlhaeuser2019-07-292-2/+2
| | | | | | | | | | | | | | | | | | | | | Just a bit easier to read, in my opinion. Signed-off-by: Christian Muehlhaeuser <muesli@gmail.com> (cherry picked from commit 91d314ce8f13eff06fd4af8b869cee5a3e2ab014)
| * | plumbing/format: idxfile, unsigned values are never < 0Christian Muehlhaeuser2019-07-291-4/+0
| | | | | | | | | | | | | | | Signed-off-by: Christian Muehlhaeuser <muesli@gmail.com> (cherry picked from commit 047bb4f6d0657389ddd4ca3230ff3bee08d66a6b)
| * | *: added missing error checks in testsChristian Muehlhaeuser2019-07-297-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we assign a value to err, make sure to also check for it being nil afterwards. If those were intentionally unchecked, we should remove the assignment in the first place. Those checks certainly never harm, but please review thoroughly and let me know. Signed-off-by: Christian Muehlhaeuser <muesli@gmail.com> (cherry picked from commit 19d6f42a4d814a50bd262fbb69a9b670db9756a2)
| * | *: fixed tautological error conditionsautological error conditionsChristian Muehlhaeuser2019-07-293-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added missing error handling around encodeCommitData and prevented shadowing err. - Removed tautological error checks. Signed-off-by: Christian Muehlhaeuser <muesli@gmail.com> (cherry picked from commit 7d76176416551fc21d98bc17768d158a82281406)
| * | plumbing/object: simplify codeChristian Muehlhaeuser2019-07-291-8/+2
|/ / | | | | | | | | | | | | | | - Use append instead of ranged for loop - Simpler bool comparison Signed-off-by: Christian Muehlhaeuser <muesli@gmail.com> (cherry picked from commit 3918d0e1b73f5e59a8c93e2b5ae99295cef26cf9)
* | Merge pull request #1197 from hypnoce/masterMáximo Cuadros2019-07-292-5/+5
|\ \ | |/ |/| Make http.AuthMethod setAuth public. Fixes #1196
| * Make http.AuthMethod setAuth public. Fixes #1196JACQUES Francois2019-07-282-5/+5
|/ | | | Signed-off-by: JACQUES Francois <Francois.JACQUES@murex.com>
* Merge pull request #1165 from seletskiy/push-pruneMáximo Cuadros2019-07-265-16/+129
|\ | | | | Remote: add Prune option to PushOptions
| * send PACK only if non-delete command presentStanislav Seletskiy2019-07-251-10/+26
| | | | | | | | | | | | | | | | | | According to: https://github.com/git/git/blob/master/Documentation/technical/pack-protocol.txt > The packfile MUST NOT be sent if the only command used is 'delete'. Signed-off-by: Stanislav Seletskiy <s.seletskiy@gmail.com>
| * add Prune option to PushOptionsStanislav Seletskiy2019-07-255-6/+103
| | | | | | | | Signed-off-by: Stanislav Seletskiy <s.seletskiy@gmail.com>
* | Merge pull request #1181 from muesli/typo-fixesMáximo Cuadros2019-07-262-3/+3
|\ \ | | | | | | Fix typos in comments
| * | Fix typos in commentsChristian Muehlhaeuser2019-07-212-3/+3
| | | | | | | | | | | | | | | | | | Just a few simple, nit-picky typo fixes. Signed-off-by: Christian Muehlhaeuser <muesli@gmail.com>